From nobody Tue Jan 27 18:44:38 2026 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 4f0vTL6Nbpz6QGFX for ; Tue, 27 Jan 2026 18:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vTL2xHwz3rsM for ; Tue, 27 Jan 2026 18:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539478; 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=ymojrEtFTA8xUlOHD4guu62oyAPNp6BroVP5y4e8ZRw=; b=NNiKlfjrZ+kB+WoQPhbPq/o1TXup2xRa0UksN5q8/a7pz+cuzGFuH/xBZhSPV5T3oyTmpn 1/6EPDQymSL+q2W5RYRinYl53gP0QmfrZqbV8/6IMXe6XxRDQcCfc1qVobdliQ/PhbZtK2 oJi5wSUF+4apV4+8i9Ltnb925482L9CJj1k1/vxrosKqo10VyxsBJXFR0IIIkMH0P1IARj Ns1b/c99pO0yJWFYIRYPHQFwjVd9hFVienOHazdvSCtyhp+YM5qQP0mGaWZpM6r8aSZAFl POPMtK0bwz9s3JdRhkDyJ3yopul0w/BAvOvMb/FjFoxZ413NDxVTPrEKBJhwdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539478; 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=ymojrEtFTA8xUlOHD4guu62oyAPNp6BroVP5y4e8ZRw=; b=WkzJ4GDrX2H2ZBruw11nTMT2Q6qqNlFjLU1i/9c2eLrP7fB837WgGpkF6BJFZAhF3E04bt 4tQ4mZe0N3ALN/jId80FvtWMjbfJIOvUDsCU5U/vOUtFe10poKsoplVrWJgFz2uikG2zVd mgEnL4wN7RCpf9iA5B36IbrvUX+x+Ukh8VUVS0pCOX38MNd6rzCIaxMNDzG4mF5iIfAr22 Nl8SPTuddEDpuU5UCqNSB4rglrWaOvyva6opQi3mP37zkzmwtvQ8cK9a9QxscSYDWFRH1v JYOyyOaDGoN0Gt4I/yo4fVeREAuR2HsWLoRPg2kQa/tSv6cB23hZr2AO7a47QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539478; a=rsa-sha256; cv=none; b=BqOPIOZhgxSvHOMQV/amF2G4lpPlJLXI1ipk4k2Lvv9J10V1/XVxBAGDubxMNNyMkezcPd VpndBqLHGb2buz4ZYbw2ZnP+fLVVpHAW70My/IjhOeIFHh54SbF6VTFGuZx892KAuuEaFh R9jv1ahU/wuZGnDsNUYzLDe73D0V8nu24hy+5frGlLeKHNPMCNhyA8z5XJnNekPpgXWi09 mIOkqoPWn464XooJS2rsnOVxBgtVIAVQcFBLNQcMnGvjuixvW1ZTAS0ecLXprjzChKfvqu v5V9f4kmK5Ri3Vw4x41xVawJy0+a8I+JF+mmU/hRHX9kGdcVQw7QnVnBmU21vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vTL2Y2Bz3Yd for ; Tue, 27 Jan 2026 18:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f5c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4ecaa02a8797 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ecaa02a8797347f4b85a70902430a4f9f45ef76 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:38 +0000 Message-Id: <69790796.f5c3.7bbe2020@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4ecaa02a8797347f4b85a70902430a4f9f45ef76 commit 4ecaa02a8797347f4b85a70902430a4f9f45ef76 Author: John Baldwin AuthorDate: 2025-08-04 19:38:06 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +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 (cherry picked from commit 34e8d66412cd81d020f0e75d078a4404ec39cf5a) --- 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 bcde2f1ae433..c44c3726e74e 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -53,8 +53,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 d25b70628d15..69a58f5f827b 100644 --- a/usr.sbin/ctld/isns.cc +++ b/usr.sbin/ctld/isns.cc @@ -41,8 +41,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 b1b6e36a5c87..fdd290988ce0 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -69,7 +69,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 *);