@@ -910,7 +910,8 @@ char_class(const unsigned char c, const unsigned int flags)

     {

         return true;

     }

-    if ((flags & CC_PRINT) && (c >= 32 && c != 127)) /* allow ascii non-control and UTF-8, consider DEL to be a control */

+    /* allow ascii non-control and UTF-8, consider DEL to be a control */

+    if ((flags & CC_PRINT) && (c >= 32 && c != 127))

     {

         return true;

     }

@@ -247,7 +247,8 @@ multi_io_wait_lite(struct multi_context *m, struct multi_instance *mi, const int

         case TA_TUN_WRITE:

             looking_for = TUN_WRITE;

             tun_input_pending = NULL;

-            c->c2.timeval.tv_sec = 1; /* For some reason, the Linux 2.2 TUN/TAP driver hits this timeout */

+            /* For some reason, the Linux 2.2 TUN/TAP driver hits this timeout */

+            c->c2.timeval.tv_sec = 1;

             perf_push(PERF_PROC_OUT_TUN_MTCP);

             io_wait(c, IOW_TO_TUN);

             perf_pop();

@@ -302,7 +302,7 @@ int net_route_v4_del(openvpn_net_ctx_t *ctx, const in_addr_t *dst,

                      int metric);

 /**

- * Delete a route for an IPv4 address/network

+ * Delete a route for an IPv6 address/network

  *

  * @param ctx       the implementation specific context

  * @param dst       the destination of the route

@@ -8392,9 +8392,10 @@ add_option(struct options *options,

         VERIFY_PERMISSION(OPT_P_DHCPDNS);

         setenv_foreign_option(options, (const char **)p, 3, es);

     }

-    else if (streq(p[0], "route-method") && p[1] && !p[2]) /* ignore when pushed to non-Windows OS */

+    else if (streq(p[0], "route-method") && p[1] && !p[2])

     {

         VERIFY_PERMISSION(OPT_P_ROUTE_EXTRAS);

+        /* ignore when pushed to non-Windows OS */

     }

 #endif /* ifdef _WIN32 */

 #if PASSTOS_CAPABILITY

@@ -44,8 +44,10 @@ time_t now_usec = 0;       /* GLOBAL */

 void

 update_now(const time_t system_time)

 {

-    const int forward_threshold = 86400; /* threshold at which to dampen forward jumps */

-    const int backward_trigger  = 10;  /* backward jump must be >= this many seconds before we adjust */

+    /* threshold at which to dampen forward jumps */

+    const int forward_threshold = 86400;

+    /* backward jump must be >= this many seconds before we adjust */

+    const int backward_trigger = 10;

     time_t real_time = system_time + now_adj;

     if (real_time > now)

@@ -246,7 +246,8 @@ tv_delta(struct timeval *dest, const struct timeval *t1, const struct timeval *t

 static inline bool

 tv_within_sigma(const struct timeval *t1, const struct timeval *t2, unsigned int sigma)

 {

-    const int delta = tv_subtract(t1, t2, TV_WITHIN_SIGMA_MAX_SEC); /* sigma should be less than 10 minutes */

+    /* sigma should be less than 10 minutes */

+    const int delta = tv_subtract(t1, t2, TV_WITHIN_SIGMA_MAX_SEC);

     return -(int)sigma <= delta && delta <= (int)sigma;

 }

@@ -212,7 +212,8 @@ struct tuntap

 #ifdef _WIN32

     HANDLE hand;

-    OVERLAPPED dco_new_peer_ov; /* used for async NEW_PEER dco call, which might wait for TCP connect */

+    /* used for async NEW_PEER dco call, which might wait for TCP connect */

+    OVERLAPPED dco_new_peer_ov;

     struct overlapped_io reads;

     struct overlapped_io writes;

     struct rw_handle rw_handle;