From nobody Mon Aug 4 19:46:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bwnB631JHz63Ql1; Mon, 04 Aug 2025 19:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwnB52QTjz4KD1; Mon, 04 Aug 2025 19:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y4Ol4N8ob9iiW3lvGktyTz9lbyMV48+NX07rbqeTXtE=; b=uDPPxMnMDFIi+XfoFKm9AEgRpQNXiGWhZNxvh3l+B7HfvXugg9Rof83kR5XUp4PNc8nXTN BuoZFSrpr7BVMYOjXqOZxu6nxFXYWj1s9Z7FI9F4Eu5vcmlnHK7PG4K1o6d6DeOMAYHv60 Y96L1+D3sVPEmkQ4clqscp9eN1l7CMDUQby5B05a75+SBILAywlQlBcwqOb2igyrMToNO4 eEc3bzrz1JWCP1J5oF8qPNChaW0sY0cn5fxNfcY/7j/B9aQWS6fwi0lS8AF9AFUDLoP9O8 tPxXwDrRkQ7TU+o5PkX1i3JQeCtOp5sRlZ23hoMcmsEZHpj6+/4U1DWIPapPsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y4Ol4N8ob9iiW3lvGktyTz9lbyMV48+NX07rbqeTXtE=; b=ti9yilPwccGP+au9HG1ot6u5TayFsfLsgNtRAVyxCyt1L0QHyj2VLZCjwQjb3kszMqPYp8 zTeCDAYnpNT/BhSIJk1QVMJTVarb928XpInbY9D1At8RdGm2EWAPpo6pNpCmw6YHusIFdc XylcyOfuxGl3c4ibKw+hfEFcXzoD0tBEul7oPS7gyxPM/9EsOAmg30GD+7bNpuxmnCxYWV 8GHEWCmM5qqOz/p9rorwtsgmCvtrkvImNa1Tm+RSZURBpJfvQ8s4GtEQZTOH33dKU+RaEW h8+8qEi8Z1GWV7YtphpUsewLEa6tYtV+3rzWzK9NGSCqppuapX7edL6zt502YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754336797; a=rsa-sha256; cv=none; b=xSu5FvmPsliM2p5TNJswsO0snG64ldhz+ju1IDlx4ixAPLpY+tgDW3SFtD5R2BgzlhA42n N18j6HBCpzYuB4HKTUvQsxx7HeTF8YAueihGf/RiDrvDRM8kxo/qXktbC7UsmtyN/yoB2m v5IqNvPcDJDBEqRHFMYRt2skuuyb1lu+FrvNPBFz9dKvtDnkB8ud7WC52tvgXikBi5nYxQ wa1lD3qfAnwN4oN92kLij+9l0jyfIGm4CpQQHCTsc7RLBKNCoxKHs9MBs06cIxgE3255Il eXVbADtuQlr4mOAn4wZX7fEkSwLJrs3kNa9xa/oV7K97eTQeQQCrC/3XeEa0rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bwnB50mVLz13B6; Mon, 04 Aug 2025 19:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 574Jkbte098714; Mon, 4 Aug 2025 19:46:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574JkbGU098711; Mon, 4 Aug 2025 19:46:37 GMT (envelope-from git) Date: Mon, 4 Aug 2025 19:46:37 GMT Message-Id: <202508041946.574JkbGU098711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 34e8d66412cd - main - ctld: Rename {ctld,isns}.h to {ctld,isns}.hh List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34e8d66412cd81d020f0e75d078a4404ec39cf5a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=34e8d66412cd81d020f0e75d078a4404ec39cf5a commit 34e8d66412cd81d020f0e75d078a4404ec39cf5a Author: John Baldwin AuthorDate: 2025-08-04 19:38:06 +0000 Commit: John Baldwin 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 #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 #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 #include @@ -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 #include -#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 #include -#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 #include -#include "ctld.h" +#include "ctld.hh" #ifdef ICL_KERNEL_PROXY #include 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 #include -#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 #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 *);