From: "cron2 (Code Review)" Date: Mon, 4 Aug 2025 09:15:57 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <803725a4a309dbf9553ed751899c9716113a504d-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="kpBJlJjBfac="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Disable clang-format for some code parts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --kpBJlJjBfac= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/82= 9?usp=3Demail ) Change subject: Disable clang-format for some code parts ...................................................................... Disable clang-format for some code parts These do not come out better with clang-format, so leave them be. Change-Id: I4dd0c44982955f16ec4a3f167d4e6f3e9b4dbc11 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250804091027.13509-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 492.html Signed-off-by: Gert Doering --- M src/openvpn/ssl_common.h M src/tapctl/main.c 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 90c0086..1fdc187 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -74,6 +74,7 @@ * * @{ */ +/* clang-format off */ #define S_ERROR (-2) /**< Error state. */ #define S_ERROR_PRE (-1) /**< Error state but try to send out alerts * before killing the keystore and moving @@ -104,7 +105,7 @@ #define S_GENERATED_KEYS 8 /**< The data channel keys have been gener= ated * The TLS session is fully authenticated * when reaching this state. */ - +/* clang-format on */ /* Note that earlier versions also had a S_OP_NORMAL state that was * virtually identical with S_ACTIVE and the code still assumes everything * >=3D S_ACTIVE to be fully operational */ diff --git a/src/tapctl/main.c b/src/tapctl/main.c index 82caeaf..0dec303 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -36,6 +36,7 @@ #endif +/* clang-format off */ const WCHAR title_string[] =3D _L(PACKAGE_NAME) L" " _L(PACKAGE_VERSION) ; @@ -110,6 +111,7 @@ L"\n" L"tapctl delete \n" ; +/* clang-format on */ /** -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/829?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I4dd0c44982955f16ec4a3f167d4e6f3e9b4dbc11 Gerrit-Change-Number: 829 Gerrit-PatchSet: 13 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --kpBJlJjBfac= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Disable clang-format for some code parts
These do not come out better with clang-format,
so leave them be.
<= br>Change-Id: I4dd0c44982955f16ec4a3f167d4e6f3e9b4dbc11
Signed-off-by: F= rank Lichtenheld <frank@...2641...>
Acked-by: Gert Doering <ger= t@...1296...>
Message-Id: <20250804091027.13509-1-gert@...1296...&= gt;
URL: https://www.mail-archive.com/openvpn-devel@...475...= t/msg32492.html
Signed-off-by: Gert Doering <gert@...1296...>
-= --
M src/openvpn/ssl_common.h
M src/tapctl/main.c
2 files changed,= 4 insertions(+), 1 deletion(-)

diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h<=
br>index 90c0086..1fdc187 100644
--- a/src/openvpn/ss= l_common.h
+++ b/src/openvpn/ssl_common.h
@= @ -74,6 +74,7 @@
*
* @{
*/
+/* clang-forma= t off */
#define S_ERROR (-2) /**< Error sta= te. */
#define S_ERROR_PRE (-1) /**< Error stat= e but try to send out alerts
= * before killing the keystore and moving
@@ -104,7 +10= 5,7 @@
#define S_GENERATED_KEYS 8 /**< The data ch= annel keys have been generated
= * The TLS session is fully authenticated
= * when reaching this state. */
-
+/* clang-format on */
/* Note that earlier v= ersions also had a S_OP_NORMAL state that was
* virtually= identical with S_ACTIVE and the code still assumes everything
* >=3D S_ACTIVE to be fully operational */
diff --= git a/src/tapctl/main.c b/src/tapctl/main.c
index 82caeaf..= 0dec303 100644
--- a/src/tapctl/main.c
+++ = b/src/tapctl/main.c
@@ -36,6 +36,7 @@
#end= if


+/* clang-format off */
const WCHAR titl= e_string[] =3D
_L(PACKAGE_NAME) L" " _L(PACK= AGE_VERSION)
;
@@ -110,6 +111,7 @@<= br> L"\n"
L"tapctl delete <= ;adapter GUID | adapter name>\n"
;
+/* clang-format on */


/**

To view, visit change 829. To unsubscribe, or for help writing mail filters= , visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4dd0c44982955f16ec4a3f167d4= e6f3e9b4dbc11
Gerrit-Change-Number: 829
Gerrit-PatchSet: 13
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--kpBJlJjBfac=--