[Openvpn-devel,2/3] uncrustify openvpnserv/ sources

Message ID 20181130135641.11533-2-gert@greenie.muc.de
State Accepted, archived
Delegated to: David Sommerseth
Headers show
Series
  • [Openvpn-devel,1/3] Uncrustify sample-plugin sources according to code style
Related show

Commit Message

Gert Doering Nov. 30, 2018, 1:56 p.m.
this is really just whitespace changes, but will make
running uncrustify as pre-commit-check easier if the
"base sources" won't see changes

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
 src/openvpnserv/interactive.c | 4 ++--
 src/openvpnserv/service.c     | 4 ++--
 src/openvpnserv/service.h     | 2 ++
 src/openvpnserv/validate.c    | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

Comments

David Sommerseth Dec. 12, 2018, 1:21 p.m. | #1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK.  Also tested successfully with re-running uncrustify.

Your patch has been applied to the master branch

commit a7b5993d9d6319c77d80212db61c74060cd7e7f1
Author: Gert Doering
Date:   Fri Nov 30 14:56:40 2018 +0100

     uncrustify openvpnserv/ sources

     Signed-off-by: Gert Doering <gert@greenie.muc.de>
     Acked-by: David Sommerseth <davids@openvpn.net>
     Message-Id: <20181130135641.11533-2-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17971.html
     Signed-off-by: David Sommerseth <davids@openvpn.net>


- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCgAGBQJcEQtLAAoJEIbPlEyWcf3ykeAP/3RFW+FKpNfjxyoYIGe6OGG6
X8/fdW9TqfrPT1yXthYYtspQHU8BIMjtMs5NzfOQtdLdt6mxAV2dkm3IslA50xvk
fEg6fv8KCMBz7ptVmWyDdHeSoPf6U8M19Om39k5bCFOkxSmLxNOhBN16Ftpay6E4
IeU2tvClcrPGgaIez9tMV8woILKftmDipPL9WgzFpDBdraRiFRq/MTSHF5mofnu4
P06WvNNHNnes7BkVvGGal8wt8NFPWU101eO7UfstXwiYjguCzPg8docgqD2u21+Y
YapvhcxPJWsvWQ9e0bnwR9kCH47bNR4nsUGZ4/xOtM3DqLVMElyLMQiDj6/CLH1w
TrJKojCXvCa2kYtx3Rfg2047iOf0Ls7sR+jnBBhvJTQ7qtfRyTZXnj1IcLk7j/Yd
GG5EhtfCWjLNJblc/TJ+YyGMJyGijrTixPzC7ln+pTIobxbRbiNuGBxM3556eFaF
KoDpNrfmOf3PcAW0F2qPDIjT9gSZ2qsFay8nVF0vj405dBlWnGENR82Mbk1TC1vz
WY40ZeW05q/YbQhppyjXmuqqcby7k2eTPyf+lPCbDtzM2udE/+/7TloVKo3Hyrbv
Ria14cFjB5Imuge3QTnVejkuhNUoDNve+6cQmdVer5Xt37dSQCLz6aAoMN7kp570
5gjcQhHAviBu4yNBn9kq
=iIIu
-----END PGP SIGNATURE-----

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 2dc152c2..623c3ff7 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -514,7 +514,7 @@  GetStartupData(HANDLE pipe, STARTUP_DATA *sud)
     return TRUE;
 
 err:
-    sud->directory = NULL;		/* caller must not free() */
+    sud->directory = NULL;              /* caller must not free() */
     free(data);
     return FALSE;
 }
@@ -1318,7 +1318,7 @@  Undo(undo_lists_t *lists)
                     break;
 
                 case block_dns:
-                    interface_data = (block_dns_data_t*)(item->data);
+                    interface_data = (block_dns_data_t *)(item->data);
                     delete_block_dns_filters(interface_data->engine);
                     if (interface_data->metric_v4 >= 0)
                     {
diff --git a/src/openvpnserv/service.c b/src/openvpnserv/service.c
index 7157bea2..8efe25f9 100644
--- a/src/openvpnserv/service.c
+++ b/src/openvpnserv/service.c
@@ -270,8 +270,8 @@  _tmain(int argc, TCHAR *argv[])
             else if (argc > i + 2 && _tcsicmp(TEXT("instance"), argv[i] + 1) == 0)
             {
                 dispatchTable = _tcsicmp(TEXT("interactive"), argv[i + 1]) != 0 ?
-                    dispatchTable_automatic :
-                    dispatchTable_interactive;
+                                dispatchTable_automatic :
+                                dispatchTable_interactive;
 
                 service_instance = argv[i + 2];
                 i += 2;
diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h
index cb7020fc..f5afe2f0 100644
--- a/src/openvpnserv/service.h
+++ b/src/openvpnserv/service.h
@@ -77,9 +77,11 @@  extern openvpn_service_t interactive_service;
 extern LPCTSTR service_instance;
 
 VOID WINAPI ServiceStartAutomaticOwn(DWORD argc, LPTSTR *argv);
+
 VOID WINAPI ServiceStartAutomatic(DWORD argc, LPTSTR *argv);
 
 VOID WINAPI ServiceStartInteractiveOwn(DWORD argc, LPTSTR *argv);
+
 VOID WINAPI ServiceStartInteractive(DWORD argc, LPTSTR *argv);
 
 BOOL openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist);
diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c
index 5506e902..9e1d7d2d 100644
--- a/src/openvpnserv/validate.c
+++ b/src/openvpnserv/validate.c
@@ -49,6 +49,7 @@  static const WCHAR *white_list[] =
 };
 
 static BOOL IsUserInGroup(PSID sid, const PTOKEN_GROUPS groups, const WCHAR *group_name);
+
 static PTOKEN_GROUPS GetTokenGroups(const HANDLE token);
 
 /*
@@ -305,7 +306,7 @@  IsUserInGroup(PSID sid, const PTOKEN_GROUPS token_groups, const WCHAR *group_nam
             ret = EqualSid(members[i].lgrmi0_sid, sid);
         }
         NetApiBufferFree(members);
-    /* MSDN says the lookup should always iterate until err != ERROR_MORE_DATA */
+        /* MSDN says the lookup should always iterate until err != ERROR_MORE_DATA */
     } while (err == ERROR_MORE_DATA && nloop++ < 100);
 
     if (err != NERR_Success && err != NERR_GroupNotFound)