The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=34e8d66412cd81d020f0e75d078a4404ec39cf5a
commit 34e8d66412cd81d020f0e75d078a4404ec39cf5a
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2025-08-04 19:38:06 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2025-08-04 19:38:06 +0000
ctld: Rename {ctld,isns}.h to {ctld,isns}.hh
Subsequent commits will use C++ in these headers rather than only C.
conf.h remains as a C-only header since it is intended for use by the
C code generated from parse.y.
Sponsored by: Chelsio Communications
Pull Request: https://github.com/freebsd/freebsd-src/pull/1794
---
usr.sbin/ctld/conf.cc | 2 +-
usr.sbin/ctld/ctld.cc | 4 ++--
usr.sbin/ctld/{ctld.h => ctld.hh} | 6 +++---
usr.sbin/ctld/discovery.cc | 2 +-
usr.sbin/ctld/isns.cc | 4 ++--
usr.sbin/ctld/{isns.h => isns.hh} | 6 +++---
usr.sbin/ctld/kernel.cc | 2 +-
usr.sbin/ctld/login.cc | 2 +-
usr.sbin/ctld/uclparse.cc | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/usr.sbin/ctld/conf.cc b/usr.sbin/ctld/conf.cc
index a8da88056d93..1750f7ab96c6 100644
--- a/usr.sbin/ctld/conf.cc
+++ b/usr.sbin/ctld/conf.cc
@@ -40,7 +40,7 @@
#include <cam/scsi/scsi_all.h>
#include "conf.h"
-#include "ctld.h"
+#include "ctld.hh"
static struct conf *conf = NULL;
static struct auth_group *auth_group = NULL;
diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc
index ff23db6c5293..ba65befa2d0a 100644
--- a/usr.sbin/ctld/ctld.cc
+++ b/usr.sbin/ctld/ctld.cc
@@ -52,8 +52,8 @@
#include <cam/scsi/scsi_all.h>
#include "conf.h"
-#include "ctld.h"
-#include "isns.h"
+#include "ctld.hh"
+#include "isns.hh"
static bool timed_out(void);
#ifdef ICL_KERNEL_PROXY
diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.hh
similarity index 99%
rename from usr.sbin/ctld/ctld.h
rename to usr.sbin/ctld/ctld.hh
index 2cc9139fed1d..b1757f98ac81 100644
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.hh
@@ -28,8 +28,8 @@
* SUCH DAMAGE.
*/
-#ifndef CTLD_H
-#define CTLD_H
+#ifndef __CTLD_HH__
+#define __CTLD_HH__
#include <sys/_nv.h>
#include <sys/queue.h>
@@ -359,4 +359,4 @@ void discovery(struct
ctld_connection *conn);
void set_timeout(int timeout, int fatal);
-#endif /* !CTLD_H */
+#endif /* !__CTLD_HH__ */
diff --git a/usr.sbin/ctld/discovery.cc b/usr.sbin/ctld/discovery.cc
index 3ae18786f1c2..3cf1b94a9619 100644
--- a/usr.sbin/ctld/discovery.cc
+++ b/usr.sbin/ctld/discovery.cc
@@ -38,7 +38,7 @@
#include <netdb.h>
#include <sys/socket.h>
-#include "ctld.h"
+#include "ctld.hh"
#include "iscsi_proto.h"
static struct pdu *
diff --git a/usr.sbin/ctld/isns.cc b/usr.sbin/ctld/isns.cc
index e4d3744b84dc..2f1e0094c0bf 100644
--- a/usr.sbin/ctld/isns.cc
+++ b/usr.sbin/ctld/isns.cc
@@ -40,8 +40,8 @@
#include <string.h>
#include <unistd.h>
-#include "ctld.h"
-#include "isns.h"
+#include "ctld.hh"
+#include "isns.hh"
struct isns_req *
isns_req_alloc(void)
diff --git a/usr.sbin/ctld/isns.h b/usr.sbin/ctld/isns.hh
similarity index 98%
rename from usr.sbin/ctld/isns.h
rename to usr.sbin/ctld/isns.hh
index 70404b6f74e1..259a98f8b6be 100644
--- a/usr.sbin/ctld/isns.h
+++ b/usr.sbin/ctld/isns.hh
@@ -24,8 +24,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ISNS_H
-#define _ISNS_H
+#ifndef __ISNS_HH__
+#define __ISNS_HH__
#define ISNS_VERSION 0x0001
@@ -87,4 +87,4 @@ int isns_req_send(int s, struct isns_req *req);
int isns_req_receive(int s, struct isns_req *req);
uint32_t isns_req_get_status(struct isns_req *req);
-#endif /* _ISNS_H */
+#endif /* __ISNS_HH__ */
diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc
index 0cd0eaff6c6f..fbe6d9a2f22a 100644
--- a/usr.sbin/ctld/kernel.cc
+++ b/usr.sbin/ctld/kernel.cc
@@ -68,7 +68,7 @@
#include <cam/ctl/ctl_util.h>
#include <cam/ctl/ctl_scsi_all.h>
-#include "ctld.h"
+#include "ctld.hh"
#ifdef ICL_KERNEL_PROXY
#include <netdb.h>
diff --git a/usr.sbin/ctld/login.cc b/usr.sbin/ctld/login.cc
index 961f57eb03fb..e891a3ed4b67 100644
--- a/usr.sbin/ctld/login.cc
+++ b/usr.sbin/ctld/login.cc
@@ -41,7 +41,7 @@
#include <cam/ctl/ctl_io.h>
#include <cam/ctl/ctl_ioctl.h>
-#include "ctld.h"
+#include "ctld.hh"
#include "iscsi_proto.h"
#define MAX_DATA_SEGMENT_LENGTH (128 * 1024)
diff --git a/usr.sbin/ctld/uclparse.cc b/usr.sbin/ctld/uclparse.cc
index 1eb9f7736e4b..8788e1cbb981 100644
--- a/usr.sbin/ctld/uclparse.cc
+++ b/usr.sbin/ctld/uclparse.cc
@@ -42,7 +42,7 @@
#include <netinet/ip.h>
#include "conf.h"
-#include "ctld.h"
+#include "ctld.hh"
static bool uclparse_toplevel(const ucl_object_t *);
static bool uclparse_chap(const char *, const ucl_object_t *);
