apply pending uncrustify changes since v2.6.15 and this patch set

Starting with v2.6.15 tehre were uncrustify changes that needed applied; then
there were also differences in dev environments:
 * Ubuntu 22.04 has 0.72.0_f
 * Alma 9 has 0.75.1_f
and that caused output deltas from uncrustify; so reconcile those to make the
build system happy.

Author: Stefan Baranoff

src/openvpn/dco_linux.c

@@ -279,7 +279,7 @@ dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
 }
 
 static int
-ovpn_nl_cb_finish(struct nl_msg(*msg) __attribute__ ((unused)), void *arg)
+ovpn_nl_cb_finish(struct nl_msg (*msg) __attribute__ ((unused)), void *arg)
 {
     int *status = arg;
 
@@ -296,7 +296,7 @@ ovpn_nl_cb_finish(struct nl_msg(*msg) __attribute__ ((unused)), void *arg)
  * reply to see if it contains a human-readable error. If found, it is printed.
  */
 static int
-ovpn_nl_cb_error(struct sockaddr_nl(*nla) __attribute__ ((unused)),
+ovpn_nl_cb_error(struct sockaddr_nl (*nla) __attribute__ ((unused)),
                  struct nlmsgerr *err, void *arg)
 {
     struct nlmsghdr *nlh = (struct nlmsghdr *)err - 1;

src/openvpn/error.h

@@ -71,6 +71,7 @@ struct gc_arena;
 #ifdef _WIN32
 #define openvpn_errno() GetLastError()
 const char *strerror_win32(DWORD errnum, struct gc_arena *gc);
+
 #else
 #define openvpn_errno() errno
 #endif

src/openvpn/reflect_filter.h

@@ -72,4 +72,5 @@ initial_rate_limit_init(int max_per_period, int period_length);
  * free the initial-packet rate limiter structure
  */
 void initial_rate_limit_free(struct initial_packet_rate_limit *irl);
+
 #endif /* ifndef REFLECT_FILTER_H */

src/openvpn/tun.h

@@ -755,6 +755,7 @@ tun_set(struct tuntap *tt,
 }
 
 const char *tun_stat(const struct tuntap *tt, unsigned int rwflags, struct gc_arena *gc);
+
 bool tun_name_is_fixed(const char *dev);
 
 static inline bool

src/openvpn/xkey_provider.c

@@ -55,7 +55,7 @@ typedef struct
     do {                                                        \
         dmsg(f|M_NOLF, "xkey_provider: In %s: ", __func__);    \
         dmsg(f|M_NOPREFIX, __VA_ARGS__);                      \
-    } while(0)
+    } while (0)
 
 typedef enum
 {
@@ -597,7 +597,7 @@ static const OSSL_DISPATCH rsa_keymgmt_functions[] = {
     {OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},
     {OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))keymgmt_get_params},
     {OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))keymgmt_set_params},
-    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},   /* same as gettable */
+    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},    /* same as gettable */
     {OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME, (void (*)(void))rsa_keymgmt_name},
     {0, NULL }
 };
@@ -613,7 +613,7 @@ static const OSSL_DISPATCH ec_keymgmt_functions[] = {
     {OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},
     {OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))keymgmt_get_params},
     {OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))keymgmt_set_params},
-    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},   /* same as gettable */
+    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},    /* same as gettable */
     {OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME, (void (*)(void))ec_keymgmt_name},
     {0, NULL }
 };
@@ -629,7 +629,7 @@ static const OSSL_DISPATCH ed448_keymgmt_functions[] = {
     {OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},
     {OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))keymgmt_get_params},
     {OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))keymgmt_set_params},
-    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},       /* same as gettable */
+    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},        /* same as gettable */
     {0, NULL }
 };
 
@@ -644,7 +644,7 @@ static const OSSL_DISPATCH ed25519_keymgmt_functions[] = {
     {OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},
     {OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))keymgmt_get_params},
     {OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))keymgmt_set_params},
-    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},       /* same as gettable */
+    {OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))keymgmt_gettable_params},        /* same as gettable */
     {0, NULL }
 };