From: Frank Lichtenheld Date: Tue, 10 Feb 2026 15:16:31 +0000 (+0100) Subject: Update the clang-format reference version to 21.1.8 X-Git-Tag: v2.7.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44a5b330210ef1f1fd371a178bb0b1aefdab8088;p=thirdparty%2Fopenvpn.git Update the clang-format reference version to 21.1.8 Latest v21.x version. Changes a few file in Windows specific code due to bug fixes. Change-Id: Iaf0d8f528211f1971f163a8006b054efb4917e2a Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1514 Message-Id: <20260210151639.913-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35563.html Signed-off-by: Gert Doering --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c1bca47f9..5fd54650f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format - rev: 'v20.1.0' + rev: 'v21.1.8' hooks: - id: clang-format files: \.[ch]$ diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index b5d8cd2eb..a145b6475 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -308,7 +308,8 @@ cleanup_pAdapterList: } -UINT __stdcall FindSystemInfo(_In_ MSIHANDLE hInstall) +UINT __stdcall +FindSystemInfo(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) @@ -335,7 +336,8 @@ UINT __stdcall FindSystemInfo(_In_ MSIHANDLE hInstall) } -UINT __stdcall CloseOpenVPNGUI(_In_ MSIHANDLE hInstall) +UINT __stdcall +CloseOpenVPNGUI(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) @@ -359,7 +361,8 @@ UINT __stdcall CloseOpenVPNGUI(_In_ MSIHANDLE hInstall) } -UINT __stdcall StartOpenVPNGUI(_In_ MSIHANDLE hInstall) +UINT __stdcall +StartOpenVPNGUI(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) @@ -620,7 +623,8 @@ schedule_adapter_delete(_Inout_ struct msica_arg_seq *seq, } -UINT __stdcall EvaluateTUNTAPAdapters(_In_ MSIHANDLE hInstall) +UINT __stdcall +EvaluateTUNTAPAdapters(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) @@ -963,7 +967,8 @@ CreateRebootFile(_In_z_ LPCWSTR szTmpDir) } } -UINT __stdcall ProcessDeferredAction(_In_ MSIHANDLE hInstall) +UINT __stdcall +ProcessDeferredAction(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) @@ -1166,7 +1171,8 @@ cleanup_CoInitialize: return uiResult; } -UINT __stdcall CheckAndScheduleReboot(_In_ MSIHANDLE hInstall) +UINT __stdcall +CheckAndScheduleReboot(_In_ MSIHANDLE hInstall) { #ifdef DLLEXP_EXPORT #pragma comment(linker, DLLEXP_EXPORT) diff --git a/src/tapctl/main.c b/src/tapctl/main.c index 6bb4119aa..1d047dd77 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -609,7 +609,8 @@ command_delete(int argc, LPCWSTR argv[], BOOL *bRebootRequired) /** * Program entry point */ -int __cdecl wmain(int argc, LPCWSTR argv[]) +int __cdecl +wmain(int argc, LPCWSTR argv[]) { int iResult; BOOL bRebootRequired = FALSE;