@@ -9,6 +9,11 @@ nl_brace_else=add

 nl_elseif_brace=add

 nl_else_brace=add

 nl_else_if=remove

+nl_for_brace=add

+nl_while_brace=add

+nl_switch_brace=add

+nl_fdef_brace=add

+nl_do_brace=add

 sp_func_proto_paren=Remove

 sp_func_def_paren=Remove

 sp_func_call_paren=Remove

@@ -44,6 +49,9 @@ nl_after_func_proto=2

 # Always use scoping braces for conditionals

 mod_full_brace_if=add

 mod_full_brace_if_chain=false

+mod_full_brace_while=add

+mod_full_brace_for=add

+mod_full_brace_do=add

 # Annotate #else and #endif statements

 mod_add_long_ifdef_endif_comment=20

@@ -58,7 +58,8 @@ int

 daemon(int nochdir, int noclose)

 {

 #if defined(HAVE_FORK) && defined(HAVE_SETSID)

-    switch (fork()) {

+    switch (fork())

+    {

         case -1:

             return (-1);

@@ -44,7 +44,8 @@ __memrchr(const char *str, int c, size_t n)

     const char *end = str;

     end += n - 1; /* Go to the end of the string */

-    while (end >= str) {

+    while (end >= str)

+    {

         if (c == *end)

         {

             return end;

@@ -82,10 +83,12 @@ dirname(char *path)

         char *runp;

         for (runp = last_slash; runp != path; --runp)

+        {

             if (runp[-1] != separator)

             {

                 break;

             }

+        }

         /* The '/' is the last character, we have to look further.  */

         if (runp != path)

@@ -100,10 +103,12 @@ dirname(char *path)

         char *runp;

         for (runp = last_slash; runp != path; --runp)

+        {

             if (runp[-1] != separator)

             {

                 break;

             }

+        }

         /* Terminate the path.  */

         if (runp == path)

@@ -52,7 +52,8 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size)

     ZeroMemory(&ss, sizeof(ss));

     ss.ss_family = af;

-    switch (af) {

+    switch (af)

+    {

         case AF_INET:

             ((struct sockaddr_in *)&ss)->sin_addr = *(struct in_addr *)src;

             break;

@@ -59,7 +59,8 @@ inet_pton(int af, const char *src, void *dst)

     if (WSAStringToAddress(src_copy, af, NULL, (struct sockaddr *)&ss, &size) == 0)

     {

-        switch (af) {

+        switch (af)

+        {

             case AF_INET:

                 *(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr;

                 return 1;

@@ -30,62 +30,74 @@ IsWindowsVersionOrGreater(WORD major, WORD minor, WORD servpack)

 }

 VERSIONHELPERAPI

-IsWindowsXPOrGreater(void) {

+IsWindowsXPOrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0);

 }

 VERSIONHELPERAPI

-IsWindowsXPSP1OrGreater(void) {

+IsWindowsXPSP1OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 1);

 }

 VERSIONHELPERAPI

-IsWindowsXPSP2OrGreater(void) {

+IsWindowsXPSP2OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 2);

 }

 VERSIONHELPERAPI

-IsWindowsXPSP3OrGreater(void) {

+IsWindowsXPSP3OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 3);

 }

 VERSIONHELPERAPI

-IsWindowsVistaOrGreater(void) {

+IsWindowsVistaOrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0);

 }

 VERSIONHELPERAPI

-IsWindowsVistaSP1OrGreater(void) {

+IsWindowsVistaSP1OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 1);

 }

 VERSIONHELPERAPI

-IsWindowsVistaSP2OrGreater(void) {

+IsWindowsVistaSP2OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 2);

 }

 VERSIONHELPERAPI

-IsWindows7OrGreater(void) {

+IsWindows7OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0);

 }

 VERSIONHELPERAPI

-IsWindows7SP1OrGreater(void) {

+IsWindows7SP1OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 1);

 }

 VERSIONHELPERAPI

-IsWindows8OrGreater(void) {

+IsWindows8OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);

 }

 VERSIONHELPERAPI

-IsWindows8Point1OrGreater(void) {

+IsWindows8Point1OrGreater(void)

+{

     return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0);

 }

 VERSIONHELPERAPI

-IsWindowsServer(void) {

+IsWindowsServer(void)

+{

     OSVERSIONINFOEXW vi = {sizeof(vi),0,0,0,0,{0},0,0,0,VER_NT_WORKSTATION};

     return !VerifyVersionInfoW(&vi, VER_PRODUCT_TYPE, VerSetConditionMask(0, VER_PRODUCT_TYPE, VER_EQUAL));

 }

@@ -60,7 +60,9 @@ argv_reset(struct argv *a)

 {

     size_t i;

     for (i = 0; i < a->argc; ++i)

+    {

         free(a->argv[i]);

+    }

     free(a->argv);

     argv_init(a);

 }

@@ -74,7 +76,9 @@ argv_extend(struct argv *a, const size_t newcap)

         size_t i;

         ALLOC_ARRAY_CLEAR(newargv, char *, newcap);

         for (i = 0; i < a->argc; ++i)

+        {

             newargv[i] = a->argv[i];

+        }

         free(a->argv);

         a->argv = newargv;

         a->capacity = newcap;

@@ -104,11 +108,15 @@ argv_clone(const struct argv *a, const size_t headroom)

     argv_init(&r);

     for (i = 0; i < headroom; ++i)

+    {

         argv_append(&r, NULL);

+    }

     if (a)

     {

         for (i = 0; i < a->argc; ++i)

+        {

             argv_append(&r, string_alloc(a->argv[i], NULL));

+        }

     }

     return r;

 }

@@ -332,7 +340,9 @@ argv_parse_cmd(struct argv *a, const char *s)

     {

         int i;

         for (i = 0; i < nparms; ++i)

+        {

             argv_append(a, string_alloc(parms[i], NULL));

+        }

     }

     else

     {

@@ -69,7 +69,8 @@ openvpn_base64_encode(const void *data, int size, char **str)

     }

     q = (const unsigned char *) data;

     i = 0;

-    for (i = 0; i < size; ) {

+    for (i = 0; i < size; )

+    {

         c = q[i++];

         c *= 256;

         if (i < size)

@@ -107,10 +108,12 @@ pos(char c)

 {

     char *p;

     for (p = base64_chars; *p; p++)

+    {

         if (*p == c)

         {

             return p - base64_chars;

         }

+    }

     return -1;

 }

@@ -126,7 +129,8 @@ token_decode(const char *token)

     {

         return DECODE_ERROR;

     }

-    for (i = 0; i < 4; i++) {

+    for (i = 0; i < 4; i++)

+    {

         val *= 64;

         if (token[i] == '=')

         {

@@ -164,7 +168,8 @@ openvpn_base64_decode(const char *str, void *data, int size)

     {

         e = q + size;

     }

-    for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {

+    for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4)

+    {

         unsigned int val = token_decode(p);

         unsigned int marker = (val >> 24) & 0xff;

         if (val == DECODE_ERROR)

@@ -443,7 +443,9 @@ gc_transfer(struct gc_arena *dest, struct gc_arena *src)

         if (e)

         {

             while (e->next != NULL)

+            {

                 e = e->next;

+            }

             e->next = dest->list;

             dest->list = src->list;

             src->list = NULL;

@@ -599,7 +601,8 @@ void

 rm_trailing_chars(char *str, const char *what_to_delete)

 {

     bool modified;

-    do {

+    do

+    {

         const int len = strlen(str);

         modified = false;

         if (len > 0)

@@ -682,7 +685,9 @@ string_array_len(const char **array)

     if (array)

     {

         while (array[i])

+        {

             ++i;

+        }

     }

     return i;

 }

@@ -1320,7 +1325,9 @@ buffer_list_file(const char *fn, int max_line_len)

         {

             bl = buffer_list_new(0);

             while (fgets(line, max_line_len, fp) != NULL)

+            {

                 buffer_list_push(bl, (unsigned char *)line);

+            }

             free(line);

         }

         fclose(fp);

@@ -404,7 +404,9 @@ secure_memzero(void *data, size_t len)

 #else

     volatile char *p = (volatile char *) data;

     while (len--)

+    {

         *p++ = 0;

+    }

 #endif

 }

@@ -316,6 +316,7 @@ const struct compress_alg lz4v2_alg = {

 #else  /* if defined(ENABLE_LZ4) */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* ENABLE_LZ4 */

@@ -179,6 +179,7 @@ const struct compress_alg comp_stub_alg = {

 #else  /* if defined(USE_COMP) */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* USE_STUB */

@@ -49,7 +49,8 @@ query_user_clear()

 {

     int i;

-    for (i = 0; i < QUERY_USER_NUMSLOTS; i++) {

+    for (i = 0; i < QUERY_USER_NUMSLOTS; i++)

+    {

         CLEAR(query_user[i]);

     }

 }

@@ -68,7 +69,8 @@ query_user_add(char *prompt, size_t prompt_len,

     ASSERT( prompt_len > 0 && prompt != NULL && resp_len > 0 && resp != NULL );

     /* Seek to the last unused slot */

-    for (i = 0; i < QUERY_USER_NUMSLOTS; i++) {

+    for (i = 0; i < QUERY_USER_NUMSLOTS; i++)

+    {

         if (query_user[i].prompt == NULL)

         {

             break;

@@ -65,7 +65,8 @@

 static void

 openvpn_encrypt_aead(struct buffer *buf, struct buffer work,

-                     struct crypto_options *opt) {

+                     struct crypto_options *opt)

+{

 #ifdef HAVE_AEAD_CIPHER_MODES

     struct gc_arena gc;

     int outlen = 0;

@@ -321,7 +322,8 @@ openvpn_encrypt(struct buffer *buf, struct buffer work,

 bool

 crypto_check_replay(struct crypto_options *opt,

                     const struct packet_id_net *pin, const char *error_prefix,

-                    struct gc_arena *gc) {

+                    struct gc_arena *gc)

+{

     bool ret = false;

     packet_id_reap_test(&opt->packet_id.rec);

     if (packet_id_test(&opt->packet_id.rec, pin))

@@ -996,7 +998,8 @@ generate_key_random(struct key *key, const struct key_type *kt)

     struct gc_arena gc = gc_new();

-    do {

+    do

+    {

         CLEAR(*key);

         if (kt)

         {

@@ -1772,7 +1775,8 @@ get_random()

 }

 static const cipher_name_pair *

-get_cipher_name_pair(const char *cipher_name) {

+get_cipher_name_pair(const char *cipher_name)

+{

     const cipher_name_pair *pair;

     size_t i = 0;

@@ -1792,7 +1796,8 @@ get_cipher_name_pair(const char *cipher_name) {

 }

 const char *

-translate_cipher_name_from_openvpn(const char *cipher_name) {

+translate_cipher_name_from_openvpn(const char *cipher_name)

+{

     const cipher_name_pair *pair = get_cipher_name_pair(cipher_name);

     if (NULL == pair)

@@ -1804,7 +1809,8 @@ translate_cipher_name_from_openvpn(const char *cipher_name) {

 }

 const char *

-translate_cipher_name_to_openvpn(const char *cipher_name) {

+translate_cipher_name_to_openvpn(const char *cipher_name)

+{

     const cipher_name_pair *pair = get_cipher_name_pair(cipher_name);

     if (NULL == pair)

@@ -490,7 +490,8 @@ void crypto_read_openvpn_key(const struct key_type *key_type,

  * Returns 0 when data is equal, non-zero otherwise.

  */

 static inline int

-memcmp_constant_time(const void *a, const void *b, size_t size) {

+memcmp_constant_time(const void *a, const void *b, size_t size)

+{

     const uint8_t *a1 = a;

     const uint8_t *b1 = b;

     int ret = 0;

@@ -122,7 +122,8 @@ bool mbed_log_func_line(unsigned int flags, int errval, const char *func,

 /** Wraps mbed_log_func_line() to prevent function calls for non-errors */

 static inline bool

 mbed_log_func_line_lite(unsigned int flags, int errval,

-                        const char *func, int line) {

+                        const char *func, int line)

+{

     if (errval)

     {

         return mbed_log_func_line(flags, errval, func, line);

@@ -186,7 +186,8 @@ crypto_clear_error(void)

 }

 void

-crypto_print_openssl_errors(const unsigned int flags) {

+crypto_print_openssl_errors(const unsigned int flags)

+{

     size_t err = 0;

     while ((err = ERR_get_error()))

@@ -551,8 +552,10 @@ cipher_kt_iv_size(const EVP_CIPHER *cipher_kt)

 }

 int

-cipher_kt_block_size(const EVP_CIPHER *cipher) {

-    /* OpenSSL reports OFB/CFB/GCM cipher block sizes as '1 byte'.  To work

+cipher_kt_block_size(const EVP_CIPHER *cipher)

+{

+    /*

+     * OpenSSL reports OFB/CFB/GCM cipher block sizes as '1 byte'.  To work

      * around that, try to replace the mode with 'CBC' and return the block size

      * reported for that cipher, if possible.  If that doesn't work, just return

      * the value reported by OpenSSL.

@@ -281,7 +281,9 @@ rsa_priv_enc(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, i

     }

     /* and now, we have to reverse the byte-order in the result from CryptSignHash()... */

     for (i = 0; i < len; i++)

+    {

         to[i] = buf[len - i - 1];

+    }

     free(buf);

     CryptDestroyHash(hash);

@@ -389,7 +391,9 @@ find_certificate_in_store(const char *cert_prop, HCERTSTORE cert_store)

             }

             hash[i] = x;

             /* skip any space(s) between hex numbers */

-            for (p++; *p && *p == ' '; p++) ;

+            for (p++; *p && *p == ' '; p++)

+            {

+            }

         }

         blob.cbData = i;

         blob.pbData = (unsigned char *) &hash;

@@ -547,7 +551,8 @@ err:

 #else  /* ifdef ENABLE_CRYPTOAPI */

 #ifdef _MSC_VER  /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif

 #endif                          /* _WIN32 */

@@ -160,17 +160,20 @@ udp_checksum(const uint8_t *buf,

     /* make 16 bit words out of every two adjacent 8 bit words and  */

     /* calculate the sum of all 16 bit words */

-    for (i = 0; i < len_udp; i += 2) {

+    for (i = 0; i < len_udp; i += 2)

+    {

         word16 = ((buf[i] << 8) & 0xFF00) + ((i + 1 < len_udp) ? (buf[i+1] & 0xFF) : 0);

         sum += word16;

     }

     /* add the UDP pseudo header which contains the IP source and destination addresses */

-    for (i = 0; i < 4; i += 2) {

+    for (i = 0; i < 4; i += 2)

+    {

         word16 = ((src_addr[i] << 8) & 0xFF00) + (src_addr[i+1] & 0xFF);

         sum += word16;

     }

-    for (i = 0; i < 4; i += 2) {

+    for (i = 0; i < 4; i += 2)

+    {

         word16 = ((dest_addr[i] << 8) & 0xFF00) + (dest_addr[i+1] & 0xFF);

         sum += word16;

     }

@@ -180,7 +183,9 @@ udp_checksum(const uint8_t *buf,

     /* keep only the last 16 bits of the 32 bit calculated sum and add the carries */

     while (sum >> 16)

+    {

         sum = (sum & 0xFFFF) + (sum >> 16);

+    }

     /* Take the one's complement of sum */

     return ((uint16_t) ~sum);

@@ -836,7 +836,8 @@ strerror_win32(DWORD errnum, struct gc_arena *gc)

      * Posix equivalents.

      */

 #if 1

-    switch (errnum) {

+    switch (errnum)

+    {

         /*

          * When the TAP-Windows driver returns STATUS_UNSUCCESSFUL, this code

          * gets returned to user space.

@@ -394,7 +394,8 @@ ignore_sys_error(const int err)

 /** Convert fatal errors to nonfatal, don't touch other errors */

 static inline unsigned int

-nonfatal(const unsigned int err) {

+nonfatal(const unsigned int err)

+{

     return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err;

 }

@@ -394,11 +394,13 @@ we_wait(struct event_set *es, const struct timeval *tv, struct event_set_return

     {

         int i;

         for (i = 0; i < wes->n_events; ++i)

+        {

             dmsg(D_EVENT_WAIT, "[%d] ev=%p rwflags=0x%04x arg=" ptr_format,

                  i,

                  wes->events[i],

                  wes->esr[i].rwflags,

                  (ptr_type)wes->esr[i].arg);

+        }

     }

 #endif

@@ -922,7 +924,9 @@ se_reset(struct event_set *es)

     FD_ZERO(&ses->readfds);

     FD_ZERO(&ses->writefds);

     for (i = 0; i <= ses->maxfd; ++i)

+    {

         ses->args[i] = NULL;

+    }

     ses->maxfd = -1;

 }

@@ -44,7 +44,9 @@ fragment_list_buf_init(struct fragment_list *list, const struct frame *frame)

 {

     int i;

     for (i = 0; i < N_FRAG_BUF; ++i)

+    {

         list->fragments[i].buf = alloc_buf(BUF_SIZE(frame));

+    }

 }

 static void

@@ -52,7 +54,9 @@ fragment_list_buf_free(struct fragment_list *list)

 {

     int i;

     for (i = 0; i < N_FRAG_BUF; ++i)

+    {

         free_buf(&list->fragments[i].buf);

+    }

 }

 /*

@@ -67,7 +71,9 @@ fragment_list_get_buf(struct fragment_list *list, int seq_id)

     {

         int i;

         for (i = 0; i < N_FRAG_BUF; ++i)

+        {

             list->fragments[i].defined = false;

+        }

         list->index = 0;

         list->seq_id = seq_id;

         diff = 0;

@@ -433,6 +439,7 @@ fragment_wakeup(struct fragment_master *f, struct frame *frame)

 #else  /* ifdef ENABLE_FRAGMENT */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* ifdef ENABLE_FRAGMENT */

@@ -95,7 +95,8 @@ get_packet_flood_parms(int level)

  * Return true with probability 1/n

  */

 static bool

-flip(int n) {

+flip(int n)

+{

     return (get_random() % n) == 0;

 }

@@ -104,7 +105,8 @@ flip(int n) {

  * low and high.

  */

 static int

-roll(int low, int high) {

+roll(int low, int high)

+{

     int ret;

     ASSERT(low <= high);

     ret = low + (get_random() % (high - low + 1));

@@ -181,7 +183,8 @@ ask_gremlin(int flags)

  * Possibly corrupt a packet.

  */

 void

-corrupt_gremlin(struct buffer *buf, int flags) {

+corrupt_gremlin(struct buffer *buf, int flags)

+{

     const int corrupt_level = GREMLIN_CORRUPT_LEVEL(flags);

     if (corrupt_level)

     {

@@ -194,7 +197,8 @@ corrupt_gremlin(struct buffer *buf, int flags) {

                     uint8_t r = roll(0, 255);

                     int method = roll(0, 5);

-                    switch (method) {

+                    switch (method)

+                    {

                         case 0: /* corrupt the first byte */

                             *BPTR(buf) = r;

                             break;

@@ -232,6 +236,7 @@ corrupt_gremlin(struct buffer *buf, int flags) {

 #else  /* ifdef ENABLE_DEBUG */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* ifdef ENABLE_DEBUG */

@@ -44,7 +44,8 @@ CvtHex(

     unsigned short i;

     unsigned char j;

-    for (i = 0; i < HASHLEN; i++) {

+    for (i = 0; i < HASHLEN; i++)

+    {

         j = (Bin[i] >> 4) & 0xf;

         if (j <= 9)

         {

@@ -342,7 +342,8 @@ next_connection_entry(struct context *c)

     struct connection_entry *ce;

     int n_cycles = 0;

-    do {

+    do

+    {

         ce_defined = true;

         if (c->options.no_advance && l->current >= 0)

         {

@@ -540,8 +541,10 @@ context_init_1(struct context *c)

         int i;

         pkcs11_initialize(true, c->options.pkcs11_pin_cache_period);

         for (i = 0; i<MAX_PARMS && c->options.pkcs11_providers[i] != NULL; i++)

+        {

             pkcs11_addProvider(c->options.pkcs11_providers[i], c->options.pkcs11_protected_authentication[i],

                                c->options.pkcs11_private_mode[i], c->options.pkcs11_cert_private[i]);

+        }

     }

 #endif

@@ -621,7 +624,9 @@ init_static(void)

     {

         int i;

         for (i = 0; i < argc; ++i)

+        {

             msg(M_INFO, "argv[%d] = '%s'", i, argv[i]);

+        }

     }

 #endif

@@ -767,7 +772,9 @@ init_static(void)

                 {

                     int i;

                     for (i = 0; i < SIZE(text); ++i)

+                    {

                         buffer_list_push(bl, (unsigned char *)text[i]);

+                    }

                 }

                 printf("[cap=%d i=%d] *************************\n", listcap, iter);

                 if (!(iter & 8))

@@ -790,7 +797,9 @@ init_static(void)

                         int c;

                         printf("'");

                         while ((c = buf_read_u8(buf)) >= 0)

+                        {

                             putchar(c);

+                        }

                         printf("'\n");

                         buffer_list_advance(bl, 0);

                     }

@@ -106,7 +106,8 @@ interval_schedule_wakeup(struct interval *top, interval_t *wakeup)

  * In wakeup seconds, interval_test will return true once.

  */

 static inline void

-interval_future_trigger(struct interval *top, interval_t wakeup) {

+interval_future_trigger(struct interval *top, interval_t wakeup)

+{

     if (wakeup)

     {

 #if INTERVAL_DEBUG

@@ -476,7 +476,8 @@ list_test(void)

             int inc = 0;

             int count = 0;

-            for (base = 0; base < hash_n_buckets(hash); base += inc) {

+            for (base = 0; base < hash_n_buckets(hash); base += inc)

+            {

                 struct hash_iterator hi;

                 struct hash_element *he;

                 inc = (get_random() % 3) + 1;

@@ -670,6 +671,7 @@ hash_func(const uint8_t *k, uint32_t length, uint32_t initval)

 #else  /* if P2MP_SERVER */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* P2MP_SERVER */

@@ -267,6 +267,7 @@ const struct compress_alg lzo_alg = {

 #else  /* if defined(ENABLE_LZO) */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* ENABLE_LZO */

@@ -1984,7 +1984,9 @@ man_process_command(struct management *man, const char *line)

         {

             int i;

             for (i = 0; i < nparms; ++i)

+            {

                 msg(M_INFO, "[%d] '%s'", i, parms[i]);

+            }

         }

 #endif

@@ -3088,7 +3090,8 @@ management_io(struct management *man)

                 if (net_events & FD_READ)

                 {

                     while (man_read(man) > 0)

-                        ;

+                    {

+                    }

                     net_event_win32_clear_selected_events(&man->connection.ne32, FD_READ);

                 }

@@ -3311,7 +3314,8 @@ man_wait_for_client_connection(struct management *man,

         {

             msg(D_MANAGEMENT, "Need information from management interface, waiting...");

         }

-        do {

+        do

+        {

             man_standalone_event_loop(man, signal_received, expire);

             if (signal_received && *signal_received)

             {

@@ -3929,7 +3933,9 @@ log_history_free_contents(struct log_history *h)

 {

     int i;

     for (i = 0; i < h->size; ++i)

+    {

         log_entry_free_contents(&h->array[log_index(h, i)]);

+    }

     free(h->array);

 }

@@ -3973,7 +3979,9 @@ log_history_resize(struct log_history *h, const int capacity)

         log_history_obj_init(&newlog, capacity);

         for (i = 0; i < h->size; ++i)

+        {

             log_history_add(&newlog, &h->array[log_index(h, i)]);

+        }

         log_history_free_contents(h);

         *h = newlog;

@@ -3995,6 +4003,7 @@ log_history_ref(const struct log_history *h, const int index)

 #else  /* ifdef ENABLE_MANAGEMENT */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* ENABLE_MANAGEMENT */

@@ -174,6 +174,7 @@ mbuf_dereference_instance(struct mbuf_set *ms, struct multi_instance *mi)

 #else  /* if P2MP */

 static void

-dummy(void) {

+dummy(void)

+{

 }

 #endif /* P2MP */

@@ -650,7 +650,8 @@ const char *

 env_set_get(const struct env_set *es, const char *name)

 {

     const struct env_item *item = es->list;

-    while (item && !env_string_equal(item->string, name)) {

+    while (item && !env_string_equal(item->string, name))

+    {

         item = item->next;

     }

     return item ? item->string : NULL;

@@ -1547,7 +1548,9 @@ make_env_array(const struct env_set *es,

     if (es)

     {

         for (e = es->list; e != NULL; e = e->next)

+        {

             ++n;

+        }