From: "flichtenheld (Code Review)" Date: Wed, 19 Mar 2025 14:24:50 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <2fd29a10c1e64e066180a351fba6d9beeb424b71-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Z4TGYeybDXA="; 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: plaisthos Cc: openvpn-devel --Z4TGYeybDXA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/829?usp=3Demail to review the following change. 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 --- M src/openvpn/ssl_common.h M src/tapctl/main.c 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/829/3 diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 4e54001..97c5041 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -75,6 +75,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 @@ -102,7 +103,7 @@ #define S_GENERATED_KEYS 7 /**< 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 551a8e6..d27da6b 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -37,6 +37,7 @@ #endif +/* clang-format off */ const WCHAR title_string[] =3D _L(PACKAGE_NAME) L" " _L(PACKAGE_VERSION) ; @@ -111,6 +112,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: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --Z4TGYeybDXA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

Disable clang-format for some code parts

These do not = come out better with clang-format,
so leave them be.

Change-Id: I= 4dd0c44982955f16ec4a3f167d4e6f3e9b4dbc11
Signed-off-by: Frank Lichtenhel= d <frank@...2641...>
---
M src/openvpn/ssl_common.h
M src/ta= pctl/main.c
2 files changed, 4 insertions(+), 1 deletion(-)

gi=
t pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/829/3
diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.hindex 4e54001..97c5041 100644
--- a/src/openvpn/ssl_= common.h
+++ b/src/openvpn/ssl_common.h
@@ = -75,6 +75,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
@@ -102,7 +103,= 7 @@
#define S_GENERATED_KEYS 7 /**< The data chan= nel keys have been generated
= * The TLS session is fully authenticated
= * when reaching this state. */
-
+/* clang-format on */
/* Note that earlier ve= rsions 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 --g= it a/src/tapctl/main.c b/src/tapctl/main.c
index 551a8e6..d= 27da6b 100644
--- a/src/tapctl/main.c
+++ b= /src/tapctl/main.c
@@ -37,6 +37,7 @@
#endi= f


+/* clang-format off */
const WCHAR title= _string[] =3D
_L(PACKAGE_NAME) L" " _L(PACKA= GE_VERSION)
;
@@ -111,6 +112,7 @@ 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: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--Z4TGYeybDXA=--