tighten formatting rules

41 files changed, 375 insertions, 202 deletions

diff --git a/src/microhttpd/basicauth.c b/src/microhttpd/basicauth.c
index f1e38af4..4fba487b 100644
--- a/src/microhttpd/basicauth.c
+++ b/src/microhttpd/basicauth.c
@@ -143,7 +143,7 @@ MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection,
                        hlen,
                        "Basic realm=\"%s\"",
                        realm);
-  if ((res > 0)&&((size_t) res < hlen))
+  if ((res > 0) && ((size_t) res < hlen))
     ret = MHD_add_response_header (response,
                                    MHD_HTTP_HEADER_WWW_AUTHENTICATE,
                                    header);
@@ -167,4 +167,5 @@ MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection,
   return ret;
 }
 
+
 /* end of basicauth.c */
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index c63b8d24..fe5efff4 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -175,6 +175,8 @@ MHD_conn_init_static_ (void)
   }
 #endif /* SF_FLAGS */
 }
+
+
 #endif /* HAVE_FREEBSD_SENDFILE */
 /**
  * Callback for receiving data from the socket.
@@ -634,10 +636,12 @@ MHD_lookup_header_token_ci (const struct MHD_Connection *connection,
 {
   struct MHD_HTTP_Header *pos;
 
-  if ((NULL == connection)||(NULL == header)||(0 == header[0])||(NULL ==
-                                                                 token) ||(0 ==
-                                                                           token
-                                                                           [0]) )
+  if ((NULL == connection) || (NULL == header) || (0 == header[0]) || (NULL ==
+                                                                       token) ||
+      (0 ==
+       token
+       [
+         0]) )
     return false;
 
   for (pos = connection->headers_received; NULL != pos; pos = pos->next)
@@ -721,8 +725,7 @@ MHD_connection_mark_closed_ (struct MHD_Connection *connection)
      * and do not shutdown TCP socket. This give more
      * chances to send TLS closure data to remote side.
      * Closure of TLS layer will be interpreted by
-     * remote side as end of transmission. */
-    if (0 != (daemon->options & MHD_USE_TLS))
+     * remote side as end of transmission. */if (0 != (daemon->options & MHD_USE_TLS))
     {
       if (! MHD_tls_connection_shutdown (connection))
         shutdown (connection->socket_fd,
@@ -829,8 +832,9 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
    * used with MHD_UPGRADE_ACTION_CLOSE. They will be
    * closed by MHD_cleanup_upgraded_connection_() during
    * connection's final cleanup.
-   */
-}
+   */}
+
+
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT*/
 
 
@@ -999,7 +1003,7 @@ try_ready_chunked_body (struct MHD_Connection *connection)
       = (size_t) (connection->response_write_position - response->data_start);
     /* buffer already ready, use what is there for the chunk */
     ret = response->data_size - data_write_offset;
-    if ( ((size_t) ret) > connection->write_buffer_size - sizeof (cbuf) - 2 )
+    if ( ((size_t) ret) > connection->write_buffer_size - sizeof (cbuf) - 2)
       ret = connection->write_buffer_size - sizeof (cbuf) - 2;
     memcpy (&connection->write_buffer[sizeof (cbuf)],
             &response->data[data_write_offset],
@@ -1454,8 +1458,7 @@ build_header_response (struct MHD_Connection *connection)
 
         Note that the change from 'SHOULD NOT' to 'MUST NOT' is
         a recent development of the HTTP 1.1 specification.
-      */
-      content_length_len
+      */content_length_len
         = MHD_snprintf_ (content_length_buf,
                          sizeof (content_length_buf),
                          MHD_HTTP_HEADER_CONTENT_LENGTH ": "
@@ -1788,8 +1791,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
              or if we do nothing, we would just timeout
              on the connection (if a timeout is even
              set!).
-             Solution: we kill the connection with an error */
-          transmit_error_response (connection,
+             Solution: we kill the connection with an error */transmit_error_response (connection,
                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
                                    INTERNAL_ERROR);
           continue;
@@ -2559,8 +2561,7 @@ process_header_line (struct MHD_Connection *connection,
      header at the beginning of the while
      loop since we need to be able to inspect
      the *next* header line (in case it starts
-     with a space...) */
-  connection->last = line;
+     with a space...) */connection->last = line;
   connection->colon = colon;
   return MHD_YES;
 }
@@ -2607,8 +2608,7 @@ process_broken_line (struct MHD_Connection *connection,
  adjacency); also, in the case where these are not adjacent
  (not sure how it can happen!), we would want to allocate from
  the end of the pool, so as to not destroy the read-buffer's
- ability to grow nicely. */
-    last = MHD_pool_reallocate (connection->pool,
+ ability to grow nicely. */last = MHD_pool_reallocate (connection->pool,
                                 last,
                                 last_len + 1,
                                 last_len + tmp_len + 1);
@@ -3804,6 +3804,8 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection)
   }
   return MHD_YES;
 }
+
+
 #endif
 
 
diff --git a/src/microhttpd/connection.h b/src/microhttpd/connection.h
index 74ebafcb..88f31dbd 100644
--- a/src/microhttpd/connection.h
+++ b/src/microhttpd/connection.h
@@ -68,6 +68,7 @@
  */
 void
 MHD_conn_init_static_ (void);
+
 #endif /* HAVE_FREEBSD_SENDFILE */
 
 
@@ -152,6 +153,7 @@ MHD_connection_close_ (struct MHD_Connection *connection,
  */
 void
 MHD_connection_finish_forward_ (struct MHD_Connection *connection);
+
 #else  /* ! HTTPS_SUPPORT */
 #define MHD_connection_finish_forward_(conn) (void) conn
 #endif /* ! HTTPS_SUPPORT */
@@ -168,6 +170,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection);
  */
 int
 MHD_connection_epoll_update_ (struct MHD_Connection *connection);
+
 #endif
 
 /**
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c
index 108e1fc6..fb07deca 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -226,4 +226,5 @@ MHD_tls_connection_shutdown (struct MHD_Connection *connection)
   return false;
 }
 
+
 /* end of connection_https.c */
diff --git a/src/microhttpd/connection_https.h b/src/microhttpd/connection_https.h
index 142c8da8..58b7f619 100644
--- a/src/microhttpd/connection_https.h
+++ b/src/microhttpd/connection_https.h
@@ -74,6 +74,7 @@ ssize_t
 send_tls_adapter (struct MHD_Connection *connection,
                   const void *other,
                   size_t i);
+
 #endif /* HTTPS_SUPPORT */
 
 #endif
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index aec6aa86..c879a2df 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -216,6 +216,8 @@ MHD_check_global_init_ (void)
 #endif /* MHD_MUTEX_STATIC_DEFN_INIT_ */
 #endif
 }
+
+
 #endif /* ! _AUTOINIT_FUNCS_ARE_SUPPORTED */
 
 
@@ -654,6 +656,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
   return -1;
 }
 
+
 /**
  * Initialize security aspects of the HTTPS daemon
  *
@@ -684,6 +687,8 @@ MHD_TLS_init (struct MHD_Daemon *daemon)
     return -1;
   }
 }
+
+
 #endif /* HTTPS_SUPPORT */
 
 
@@ -858,6 +863,7 @@ urh_from_fdset (struct MHD_UpgradeResponseHandle *urh,
   }
 }
 
+
 #ifdef HAVE_POLL
 
 /**
@@ -950,6 +956,8 @@ urh_from_pollfd (struct MHD_UpgradeResponseHandle *urh,
   if (0 != (p[1].revents & MHD_POLL_REVENTS_ERRROR))
     urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY | MHD_EPOLL_STATE_WRITE_READY;
 }
+
+
 #endif /* HAVE_POLL */
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
 
@@ -1236,10 +1244,8 @@ call_handlers (struct MHD_Connection *con,
      immediately.
      As writeability of socket was not checked and it may have
      some data pending in system buffers, use this optimization
-     only for non-blocking sockets. */
-  /* No need to check 'ret' as connection is always in
-   * MHD_CONNECTION_CLOSED state if 'ret' is equal 'MHD_NO'. */
-  else if (on_fasttrack && con->sk_nonblck)
+     only for non-blocking sockets. *//* No need to check 'ret' as connection is always in
+   * MHD_CONNECTION_CLOSED state if 'ret' is equal 'MHD_NO'. */else if (on_fasttrack && con->sk_nonblck)
   {
     if (MHD_CONNECTION_HEADERS_SENDING == con->state)
     {
@@ -1312,6 +1318,8 @@ cleanup_upgraded_connection (struct MHD_Connection *connection)
   connection->urh = NULL;
   free (urh);
 }
+
+
 #endif /* UPGRADE_SUPPORT */
 
 
@@ -1371,8 +1379,7 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
      * check for any pending data even if socket is not marked
      * as 'ready' (signal may arrive after poll()/select()).
      * Socketpair for forwarding is always in non-blocking mode
-     * so no risk that recv() will block the thread. */
-    if (0 != urh->out_buffer_size)
+     * so no risk that recv() will block the thread. */if (0 != urh->out_buffer_size)
       urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY;
     /* Discard any data received form remote. */
     urh->in_buffer_used = 0;
@@ -1388,11 +1395,8 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
    * fail after remote disconnect was detected) may discard data in system
    * buffers received by system but not yet read by recv().
    * So, before trying send() on any socket, recv() must be performed at first
-   * otherwise last part of incoming data may be lost. */
-
-  /* If disconnect or error was detected - try to read from socket
-   * to dry data possibly pending is system buffers. */
-  if (0 != (MHD_EPOLL_STATE_ERROR & urh->app.celi))
+   * otherwise last part of incoming data may be lost. *//* If disconnect or error was detected - try to read from socket
+   * to dry data possibly pending is system buffers. */if (0 != (MHD_EPOLL_STATE_ERROR & urh->app.celi))
     urh->app.celi |= MHD_EPOLL_STATE_READ_READY;
   if (0 != (MHD_EPOLL_STATE_ERROR & urh->mhd.celi))
     urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY;
@@ -1669,6 +1673,8 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
     urh->mhd.celi &= ~MHD_EPOLL_STATE_READ_READY;
   }
 }
+
+
 #endif /* HTTPS_SUPPORT  && UPGRADE_SUPPORT */
 
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
@@ -1823,6 +1829,8 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
   /* Do not set 'urh->clean_ready' yet as 'urh' will be used
    * in connection thread for a little while. */
 }
+
+
 #endif /* UPGRADE_SUPPORT */
 
 
@@ -2182,7 +2190,7 @@ thread_main_handle_connection (void *data)
                            MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN :
                            MHD_REQUEST_TERMINATED_WITH_ERROR);
   MHD_connection_handle_idle (con);
-  exit:
+exit:
   if (NULL != con->response)
   {
     MHD_destroy_response (con->response);
@@ -2208,6 +2216,8 @@ thread_main_handle_connection (void *data)
   }
   return (MHD_THRD_RTRN_TYPE_) 0;
 }
+
+
 #endif
 
 
@@ -2248,6 +2258,8 @@ MHD_tls_push_func_ (gnutls_transport_ptr_t trnsp,
 #endif /* (MHD_SCKT_SEND_MAX_SIZE_ < SSIZE_MAX) || (0 == SSIZE_MAX) */
   return MHD_send_ ((MHD_socket) (intptr_t) (trnsp), data, data_size);
 }
+
+
 #endif /* MHD_TLSLIB_DONT_SUPPRESS_SIGPIPE */
 
 
@@ -2327,6 +2339,8 @@ psk_gnutls_adapter (gnutls_session_t session,
   return -1;
 #endif
 }
+
+
 #endif /* HTTPS_SUPPORT */
 
 
@@ -2742,7 +2756,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
 #endif
   }
   return MHD_YES;
-  cleanup:
+cleanup:
   if (NULL != daemon->notify_connection)
     daemon->notify_connection (daemon->notify_connection_cls,
                                connection,
@@ -3223,7 +3237,7 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
     {
       MHD_socket_close_chk_ (s);
     }
-    if ( MHD_SCKT_ERR_IS_LOW_RESOURCES_ (err) )
+    if (MHD_SCKT_ERR_IS_LOW_RESOURCES_ (err) )
     {
       /* system/process out of resources */
       if (0 == daemon->connections)
@@ -3375,8 +3389,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
            this is not true as if we fail to do manually remove it,
            we are still seeing an event for this fd in epoll,
            causing grief (use-after-free...) --- at least on my
-           system. */
-        if (0 != epoll_ctl (daemon->epoll_fd,
+           system. */if (0 != epoll_ctl (daemon->epoll_fd,
                             EPOLL_CTL_DEL,
                             pos->socket_fd,
                             NULL))
@@ -3632,7 +3645,7 @@ MHD_run_from_select (struct MHD_Daemon *daemon,
   if (0 != (daemon->options
             & (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_POLL)) )
     return MHD_NO;
-  if ((NULL == read_fd_set)||(NULL == write_fd_set))
+  if ((NULL == read_fd_set) || (NULL == write_fd_set))
     return MHD_NO;
   if (NULL == except_fd_set)
   {   /* Workaround to maintain backward compatibility. */
@@ -3770,6 +3783,8 @@ MHD_select (struct MHD_Daemon *daemon,
 #if defined(MHD_WINSOCK_SOCKETS)
   }
 }
+
+
 #endif /* MHD_WINSOCK_SOCKETS */
   }
   /* Stop listening if we are at the configured connection limit */
@@ -4130,6 +4145,8 @@ MHD_poll_listen_socket (struct MHD_Daemon *daemon,
     (void) MHD_accept_connection (daemon);
   return MHD_YES;
 }
+
+
 #endif
 
 
@@ -4319,6 +4336,8 @@ run_epoll_for_upgrade (struct MHD_Daemon *daemon)
 
   return MHD_YES;
 }
+
+
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
 
 
@@ -4607,8 +4626,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
      here.
 
      Connections with custom timeouts must all be looked at, as we
-     do not bother to sort that (presumably very short) list. */
-  prev = daemon->manual_timeout_tail;
+     do not bother to sort that (presumably very short) list. */prev = daemon->manual_timeout_tail;
   while (NULL != (pos = prev))
   {
     prev = pos->prevX;
@@ -4628,6 +4646,8 @@ MHD_epoll (struct MHD_Daemon *daemon,
   }
   return MHD_YES;
 }
+
+
 #endif
 
 
@@ -4759,6 +4779,8 @@ MHD_polling_thread (void *cls)
 
   return (MHD_THRD_RTRN_TYPE_) 0;
 }
+
+
 #endif
 
 
@@ -5644,6 +5666,8 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
   }
   return MHD_YES;
 }
+
+
 #endif
 
 
@@ -6553,7 +6577,7 @@ MHD_start_daemon_va (unsigned int flags,
   return daemon;
 
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
-  thread_failed:
+thread_failed:
   /* If no worker threads created, then shut down normally. Calling
      MHD_stop_daemon (as we do below) doesn't work here since it
      assumes a 0-sized thread pool means we had been in the default
@@ -6577,7 +6601,7 @@ MHD_start_daemon_va (unsigned int flags,
   return NULL;
 #endif
 
-  free_and_fail:
+free_and_fail:
   /* clean up basic memory state in 'daemon' and return NULL to
      indicate failure */
 #ifdef EPOLL_SUPPORT
@@ -7053,7 +7077,7 @@ MHD_get_version (void)
                              (((int) MHD_VERSION >> 24) & 0xFF),
                              (((int) MHD_VERSION >> 16) & 0xFF),
                              (((int) MHD_VERSION >> 8) & 0xFF));
-    if ((0 >= res)||(sizeof(ver) <= res))
+    if ((0 >= res) || (sizeof(ver) <= res))
       return "0.0.0"; /* Can't return real version*/
   }
   return ver;
@@ -7301,7 +7325,7 @@ MHD_init (void)
   if (0 != WSAStartup (MAKEWORD (2, 2), &wsd))
     MHD_PANIC (_ ("Failed to initialize winsock\n"));
   mhd_winsock_inited_ = 1;
-  if ((2 != LOBYTE (wsd.wVersion))&&(2 != HIBYTE (wsd.wVersion)))
+  if ((2 != LOBYTE (wsd.wVersion)) && (2 != HIBYTE (wsd.wVersion)))
     MHD_PANIC (_ ("Winsock version 2.2 is not available\n"));
 #endif /* MHD_WINSOCK_SOCKETS */
 #ifdef HTTPS_SUPPORT
@@ -7346,6 +7370,7 @@ MHD_fini (void)
   MHD_monotonic_sec_counter_finish ();
 }
 
+
 #ifdef _AUTOINIT_FUNCS_ARE_SUPPORTED
 _SET_INIT_AND_DEINIT_FUNCS (MHD_init, MHD_fini);
 #endif /* _AUTOINIT_FUNCS_ARE_SUPPORTED */
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 95aee7b4..fe078009 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -555,8 +555,7 @@ check_nonce_nc (struct MHD_Connection *connection,
    * Look for the nonce, if it does exist and its corresponding
    * nonce counter is less than the current nonce counter by 1,
    * then only increase the nonce counter by one.
-   */
-  nn = &daemon->nnc[off];
+   */nn = &daemon->nnc[off];
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
   MHD_mutex_lock_chk_ (&daemon->nnc_lock);
 #endif
@@ -938,8 +937,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
        large, but of course in theory the
        #MHD_OPTION_CONNECTION_MEMORY_LIMIT might be very large
        and would thus permit sending a >32k authorization
-       header value. */
-    return MHD_NO;
+       header value. */return MHD_NO;
   }
   if (TIMESTAMP_BIN_SIZE * 2 !=
       MHD_strx_to_uint32_n_ (nonce + len - TIMESTAMP_BIN_SIZE * 2,
@@ -957,8 +955,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
    * First level vetting for the nonce validity: if the timestamp
    * attached to the nonce exceeds `nonce_timeout', then the nonce is
    * invalid.
-   */
-  if ( (t > nonce_time + nonce_timeout) ||
+   */if ( (t > nonce_time + nonce_timeout) ||
        (nonce_time + nonce_timeout < nonce_time) )
   {
     /* too old */
@@ -981,9 +978,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
    * able to generate a "sane" nonce, which if he does
    * not, the nonce fabrication process going to be
    * very hard to achieve.
-   */
-
-  if (0 != strcmp (nonce,
+   */if (0 != strcmp (nonce,
                    noncehashexp))
   {
     return MHD_INVALID_NONCE;
@@ -1003,7 +998,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
        (0 == (len = lookup_sub_value (nc,
                                       sizeof (nc),
                                       header,
-                                      "nc")) )  ||
+                                      "nc")) ) ||
        (0 == lookup_sub_value (response,
                                sizeof (response),
                                header,
@@ -1030,8 +1025,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
    * Checking if that combination of nonce and nc is sound
    * and not a replay attack attempt. Also adds the nonce
    * to the nonce-nc map if it does not exist there.
-   */
-  if (MHD_YES !=
+   */if (MHD_YES !=
       check_nonce_nc (connection,
                       nonce,
                       nci))
@@ -1219,7 +1213,6 @@ MHD_digest_auth_check (struct MHD_Connection *connection,
   } while (0)
 
 
-
 /**
  * Authenticates the authorization header sent by the client.
  *
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index 109ebfe2..b8d8f540 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -81,6 +81,8 @@ MHD_state_to_string (enum MHD_CONNECTION_STATE state)
     return "unrecognized connection state";
   }
 }
+
+
 #endif
 #endif
 
@@ -105,6 +107,8 @@ MHD_DLOG (const struct MHD_Daemon *daemon,
                             va);
   va_end (va);
 }
+
+
 #endif
 
 
@@ -288,4 +292,5 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
   return MHD_YES;
 }
 
+
 /* end of internal.c */
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 8f7192e7..211eed9f 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -255,6 +255,7 @@ void
 MHD_DLOG (const struct MHD_Daemon *daemon,
           const char *format,
           ...);
+
 #endif
 
 
@@ -562,6 +563,7 @@ enum MHD_TLS_CONN_STATE
 #if DEBUG_STATES
 const char *
 MHD_state_to_string (enum MHD_CONNECTION_STATE state);
+
 #endif
 #endif
 
@@ -1802,7 +1804,6 @@ struct MHD_Daemon
     (element)->prev = NULL; } while (0)
 
 
-
 /**
  * Insert an element at the head of a XDLL. Assumes that head, tail and
  * element are structs with prevX and nextX fields.
diff --git a/src/microhttpd/md5.c b/src/microhttpd/md5.c
index 39b66185..05a2c9e6 100644
--- a/src/microhttpd/md5.c
+++ b/src/microhttpd/md5.c
@@ -46,6 +46,7 @@ MHD_MD5Init (void *ctx_)
   ctx->state[3] = 0x10325476;
 }
 
+
 static void
 MD5Transform (uint32_t state[4],
               const uint8_t block[MD5_BLOCK_SIZE]);
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index ddfd08d3..57e49cf0 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -100,6 +100,7 @@ MHD_init_mem_pools_ (void)
 #endif /* _WIN32 */
 }
 
+
 /**
  * Handle for a memory pool.  Pools are not reentrant and must not be
  * used by multiple threads.
diff --git a/src/microhttpd/mhd_byteorder.h b/src/microhttpd/mhd_byteorder.h
index f1f03f44..73c14240 100644
--- a/src/microhttpd/mhd_byteorder.h
+++ b/src/microhttpd/mhd_byteorder.h
@@ -125,7 +125,7 @@
   defined(_M_IX86) || defined(_X86_) || defined (__THW_INTEL__)
 /* x86 family is little endian */
 #define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
-#elif defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
+#elif defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
   defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)
 /* Looks like we are on ARM/MIPS in big endian mode */
 #define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
diff --git a/src/microhttpd/mhd_compat.c b/src/microhttpd/mhd_compat.c
index 6f6c6f9c..fd8132ac 100644
--- a/src/microhttpd/mhd_compat.c
+++ b/src/microhttpd/mhd_compat.c
@@ -79,6 +79,7 @@ W32_snprintf (char *__restrict s,
   return ret;
 }
 
+
 #endif  /* HAVE_SNPRINTF */
 #endif /* _WIN32  && !__CYGWIN__ */
 
@@ -93,16 +94,17 @@ W32_snprintf (char *__restrict s,
 #endif /* __GNUC__ >= 5 */
 
 
-void *MHD_calloc_ (size_t nelem, size_t elsize)
+void *
+MHD_calloc_ (size_t nelem, size_t elsize)
 {
   size_t alloc_size;
   void *ptr;
 #ifdef MHD_HAVE_NUL_OVERFLOW
-  if (__builtin_mul_overflow (nelem, elsize, &alloc_size) ||(0 == alloc_size))
+  if (__builtin_mul_overflow (nelem, elsize, &alloc_size) || (0 == alloc_size))
     return NULL;
 #else  /* ! MHD_HAVE_NUL_OVERFLOW */
   alloc_size = nelem * elsize;
-  if ((0 == alloc_size)||(elsize != alloc_size / nelem))
+  if ((0 == alloc_size) || (elsize != alloc_size / nelem))
     return NULL;
 #endif /* ! MHD_HAVE_NUL_OVERFLOW */
   ptr = malloc (alloc_size);
@@ -111,4 +113,6 @@ void *MHD_calloc_ (size_t nelem, size_t elsize)
   memset (ptr, 0, alloc_size);
   return ptr;
 }
+
+
 #endif /* ! HAVE_CALLOC */
diff --git a/src/microhttpd/mhd_compat.h b/src/microhttpd/mhd_compat.h
index 6b38a03e..4062c101 100644
--- a/src/microhttpd/mhd_compat.h
+++ b/src/microhttpd/mhd_compat.h
@@ -51,6 +51,7 @@
 /* Emulate snprintf function on W32 */
 int W32_snprintf (char *__restrict s, size_t n, const char *__restrict format,
                   ...);
+
 #define MHD_snprintf_ W32_snprintf
 #else  /* ! _WIN32 || __CYGWIN__ */
 #error \
@@ -84,6 +85,7 @@ int W32_snprintf (char *__restrict s, size_t n, const char *__restrict format,
  * MHD_calloc_ is platform-independent calloc()
  */
 void *MHD_calloc_ (size_t nelem, size_t elsize);
+
 #endif /* ! HAVE_CALLOC */
 
 #endif /* MHD_COMPAT_H */
diff --git a/src/microhttpd/mhd_itc.c b/src/microhttpd/mhd_itc.c
index 6c81ef62..ef5e49bd 100644
--- a/src/microhttpd/mhd_itc.c
+++ b/src/microhttpd/mhd_itc.c
@@ -65,6 +65,8 @@ MHD_itc_nonblocking_ (struct MHD_itc_ itc)
   }
   return ! 0;
 }
+
+
 #endif /* ! HAVE_PIPE2_FUNC */
 #endif /* !_WIN32 || __CYGWIN__ */
 #endif /* _MHD_ITC_EVENTFD ||  _MHD_ITC_PIPE */
diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h
index 8e303ef9..a7cad0e1 100644
--- a/src/microhttpd/mhd_itc.h
+++ b/src/microhttpd/mhd_itc.h
@@ -242,6 +242,7 @@ static const uint64_t _MHD_itc_wr_data = 1;
  */
 int
 MHD_itc_nonblocking_ (struct MHD_itc_ itc);
+
 #endif /* ! HAVE_PIPE2_FUNC */
 
 
diff --git a/src/microhttpd/mhd_mono_clock.c b/src/microhttpd/mhd_mono_clock.c
index eee911fb..fa548f6e 100644
--- a/src/microhttpd/mhd_mono_clock.c
+++ b/src/microhttpd/mhd_mono_clock.c
@@ -94,7 +94,6 @@ static int64_t perf_start;
 #endif /* _WIN32 */
 
 
-
 /**
  * Type of monotonic clock source
  */
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index db621cb2..371da6c0 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -448,6 +448,7 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection,
 #endif
 }
 
+
 /**
  * sendfile() chuck size
  */
@@ -561,8 +562,7 @@ MHD_send_sendfile_ (struct MHD_Connection *connection)
        supported for FD or other 'unusual' errors occurred, so we should try
        to fall back to 'SEND'; see also this thread for info on
        odd libc/Linux behavior with sendfile:
-       http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */
-    connection->resp_sender = MHD_resp_sender_std;
+       http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */connection->resp_sender = MHD_resp_sender_std;
     return MHD_ERR_AGAIN_;
 #else  /* HAVE_SOLARIS_SENDFILE */
     if ( (EAFNOSUPPORT == err) ||
@@ -662,4 +662,6 @@ MHD_send_sendfile_ (struct MHD_Connection *connection)
 
   return ret;
 }
+
+
 #endif /* _MHD_HAVE_SENDFILE */
diff --git a/src/microhttpd/mhd_send.h b/src/microhttpd/mhd_send.h
index 87e584a8..22d934b3 100644
--- a/src/microhttpd/mhd_send.h
+++ b/src/microhttpd/mhd_send.h
@@ -94,6 +94,7 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection,
 #if defined(_MHD_HAVE_SENDFILE)
 ssize_t
 MHD_send_sendfile_ (struct MHD_Connection *connection);
+
 #endif
 
 #endif /* MHD_SEND_H */
diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
index ad2f91bc..7172f8ee 100644
--- a/src/microhttpd/mhd_sockets.c
+++ b/src/microhttpd/mhd_sockets.c
@@ -37,7 +37,8 @@
  * @param err the WinSock error code.
  * @return pointer to string description of specified WinSock error.
  */
-const char*MHD_W32_strerror_winsock_ (int err)
+const char*
+MHD_W32_strerror_winsock_ (int err)
 {
   switch (err)
   {
@@ -358,6 +359,7 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
   return 0;
 }
 
+
 #endif /* MHD_WINSOCK_SOCKETS */
 
 
@@ -515,7 +517,7 @@ MHD_socket_cork_ (MHD_socket sock,
                        (const void *) (on ? &on_val : &off_val),
                        sizeof (off_val)))
     return 0; /* failed */
-#if defined(__FreeBSD__) &&  __FreeBSD__ + 0 >= 9
+#if defined(__FreeBSD__) && __FreeBSD__ + 0 >= 9
   /* FreeBSD do not need zero-send for flushing starting from version 9 */
   return 1;
 #elif defined(TCP_NOPUSH) && ! defined(TCP_CORK)
diff --git a/src/microhttpd/mhd_sockets.h b/src/microhttpd/mhd_sockets.h
index 3099357b..aaf58e4a 100644
--- a/src/microhttpd/mhd_sockets.h
+++ b/src/microhttpd/mhd_sockets.h
@@ -554,6 +554,7 @@ typedef int MHD_SCKT_SEND_SIZE_;
  * @return pointer to string description of specified WinSock error.
  */
 const char*MHD_W32_strerror_winsock_ (int err);
+
 #endif /* MHD_WINSOCK_SOCKETS */
 
 /* MHD_socket_last_strerr_ is description string of specified socket error code */
diff --git a/src/microhttpd/mhd_str.c b/src/microhttpd/mhd_str.c
index 80f0b82e..08162fb2 100644
--- a/src/microhttpd/mhd_str.c
+++ b/src/microhttpd/mhd_str.c
@@ -63,6 +63,8 @@ isasciilower (char c)
 {
   return (c >= 'a') && (c <= 'z');
 }
+
+
 #endif /* Disable unused functions. */
 
 
@@ -91,6 +93,8 @@ isasciialpha (char c)
 {
   return isasciilower (c) || isasciiupper (c);
 }
+
+
 #endif /* Disable unused functions. */
 
 
@@ -106,6 +110,7 @@ isasciidigit (char c)
   return (c >= '0') && (c <= '9');
 }
 
+
 #if 0 /* Disable unused functions. */
 /**
  * Check whether character is hexadecimal digit in US-ASCII
@@ -133,6 +138,8 @@ isasciialnum (char c)
 {
   return isasciialpha (c) || isasciidigit (c);
 }
+
+
 #endif /* Disable unused functions. */
 
 
@@ -167,6 +174,8 @@ toasciiupper (char c)
 {
   return isasciilower (c) ? (c - 'a' + 'A') : c;
 }
+
+
 #endif /* Disable unused functions. */
 
 
@@ -185,6 +194,8 @@ todigitvalue (char c)
 
   return -1;
 }
+
+
 #endif /* MHD_FAVOR_SMALL_CODE */
 
 
@@ -206,6 +217,8 @@ toxdigitvalue (char c)
 
   return -1;
 }
+
+
 #else  /* !INLINE_FUNC */
 
 
@@ -345,6 +358,8 @@ MHD_str_equal_caseless_ (const char *str1,
   }
   return 0 == (*str2);
 }
+
+
 #endif /* ! MHD_FAVOR_SMALL_CODE */
 
 
@@ -408,7 +423,6 @@ MHD_str_equal_caseless_bin_n_ (const char *const str1,
 }
 
 
-
 /**
  * Check whether @a str has case-insensitive @a token.
  * Token could be surrounded by spaces and tabs and delimited by comma.
@@ -456,7 +470,7 @@ MHD_str_has_token_caseless_ (const char *str,
         while (' ' == *str || '\t' == *str)
           str++;
         /* End of (sub)string? */
-        if ((0 == *str) ||(',' == *str) )
+        if ((0 == *str) || (',' == *str) )
           return true;
         /* Unmatched chars at end of substring. */
         break;
@@ -469,6 +483,7 @@ MHD_str_has_token_caseless_ (const char *str,
   return false;
 }
 
+
 #ifndef MHD_FAVOR_SMALL_CODE
 /* Use individual function for each case */
 
@@ -583,8 +598,8 @@ MHD_strx_to_uint32_ (const char *str,
   while (digit >= 0)
   {
     if ( (res < (UINT32_MAX / 16)) ||
-         ((res == (UINT32_MAX / 16)) &&( (uint32_t) digit <= (UINT32_MAX
-                                                              % 16)) ) )
+         ((res == (UINT32_MAX / 16)) && ( (uint32_t) digit <= (UINT32_MAX
+                                                               % 16)) ) )
     {
       res *= 16;
       res += digit;
@@ -630,8 +645,8 @@ MHD_strx_to_uint32_n_ (const char *str,
   while (i < maxlen && (digit = toxdigitvalue (str[i])) >= 0)
   {
     if ( (res > (UINT32_MAX / 16)) ||
-         ((res == (UINT32_MAX / 16)) &&( (uint32_t) digit > (UINT32_MAX
-                                                             % 16)) ) )
+         ((res == (UINT32_MAX / 16)) && ( (uint32_t) digit > (UINT32_MAX
+                                                              % 16)) ) )
       return 0;
 
     res *= 16;
@@ -670,8 +685,8 @@ MHD_strx_to_uint64_ (const char *str,
   while (digit >= 0)
   {
     if ( (res < (UINT64_MAX / 16)) ||
-         ((res == (UINT64_MAX / 16)) &&( (uint64_t) digit <= (UINT64_MAX
-                                                              % 16)) ) )
+         ((res == (UINT64_MAX / 16)) && ( (uint64_t) digit <= (UINT64_MAX
+                                                               % 16)) ) )
     {
       res *= 16;
       res += digit;
@@ -717,8 +732,8 @@ MHD_strx_to_uint64_n_ (const char *str,
   while (i < maxlen && (digit = toxdigitvalue (str[i])) >= 0)
   {
     if ( (res > (UINT64_MAX / 16)) ||
-         ((res == (UINT64_MAX / 16)) &&( (uint64_t) digit > (UINT64_MAX
-                                                             % 16)) ) )
+         ((res == (UINT64_MAX / 16)) && ( (uint64_t) digit > (UINT64_MAX
+                                                              % 16)) ) )
       return 0;
 
     res *= 16;
@@ -731,6 +746,7 @@ MHD_strx_to_uint64_n_ (const char *str,
   return i;
 }
 
+
 #else  /* MHD_FAVOR_SMALL_CODE */
 
 /**
@@ -767,8 +783,8 @@ MHD_str_to_uvalue_n_ (const char *str,
   int (*const dfunc)(char) = (base == 16) ?
                              toxdigitvalue : todigitvalue;
 
-  if ( ! str || ! out_val ||
-       ((base != 16)&&(base != 10)) )
+  if (! str || ! out_val ||
+      ((base != 16) && (base != 10)) )
     return 0;
 
   res = 0;
@@ -776,7 +792,7 @@ MHD_str_to_uvalue_n_ (const char *str,
   while (maxlen > i && 0 <= (digit = dfunc (str[i])))
   {
     if ( ((max_v_div_b) < res) ||
-         (( (max_v_div_b) == res) &&( (max_v_mod_b) < (uint64_t) digit) ) )
+         (( (max_v_div_b) == res) && ( (max_v_mod_b) < (uint64_t) digit) ) )
       return 0;
 
     res *= base;
@@ -795,4 +811,6 @@ MHD_str_to_uvalue_n_ (const char *str,
   }
   return i;
 }
+
+
 #endif /* MHD_FAVOR_SMALL_CODE */
diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index dd379f52..25eeb05e 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -60,6 +60,7 @@
 int
 MHD_str_equal_caseless_ (const char *str1,
                          const char *str2);
+
 #else  /* MHD_FAVOR_SMALL_CODE */
 /* Reuse MHD_str_equal_caseless_n_() to reduce size */
 #define MHD_str_equal_caseless_(s1,s2) MHD_str_equal_caseless_n_ ((s1),(s2), \
diff --git a/src/microhttpd/mhd_threads.c b/src/microhttpd/mhd_threads.c
index 6be4cb44..6e96f860 100644
--- a/src/microhttpd/mhd_threads.c
+++ b/src/microhttpd/mhd_threads.c
@@ -80,8 +80,7 @@ MHD_set_thread_name_ (const MHD_thread_ID_ thread_id,
    *                         third argument is single argument for printf;
    * OSF1 use 3 arguments too, but last one always must be zero (NULL).
    * MHD doesn't use '%' in thread names, so both form are used in same way.
-   */
-  return ! pthread_setname_np (thread_id, thread_name, 0);
+   */return ! pthread_setname_np (thread_id, thread_name, 0);
 #endif /* HAVE_PTHREAD_SETNAME_NP_NETBSD */
 }
 
@@ -235,6 +234,7 @@ MHD_create_thread_ (MHD_thread_handle_ID_ *thread,
 #endif
 }
 
+
 #ifdef MHD_USE_THREAD_NAME_
 
 #ifndef MHD_USE_THREAD_ATTR_SETNAME
@@ -276,6 +276,8 @@ named_thread_starter (void *data)
 
   return thr_func (arg);
 }
+
+
 #endif /* ! MHD_USE_THREAD_ATTR_SETNAME */
 
 
@@ -308,8 +310,7 @@ MHD_create_named_thread_ (MHD_thread_handle_ID_ *thread,
      *                         third argument is single argument for printf;
      * OSF1 use 3 arguments too, but last one always must be zero (NULL).
      * MHD doesn't use '%' in thread names, so both form are used in same way.
-     */
-    res = pthread_attr_setname_np (&attr,
+     */res = pthread_attr_setname_np (&attr,
                                    thread_name,
                                    0);
 #elif defined(HAVE_PTHREAD_ATTR_SETNAME_NP_IBMI)
@@ -318,7 +319,7 @@ MHD_create_named_thread_ (MHD_thread_handle_ID_ *thread,
 #else
 #error No pthread_attr_setname_np() function.
 #endif
-    if ((res == 0) &&(0 != stack_size) )
+    if ((res == 0) && (0 != stack_size) )
       res = pthread_attr_setstacksize (&attr,
                                        stack_size);
     if (0 == res)
@@ -365,4 +366,5 @@ MHD_create_named_thread_ (MHD_thread_handle_ID_ *thread,
 #endif /* ! MHD_USE_THREAD_ATTR_SETNAME */
 }
 
+
 #endif /* MHD_USE_THREAD_NAME_ */
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index 8b6a33ea..a7548ae3 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -1013,8 +1013,7 @@ post_process_multipart (struct MHD_PostProcessor *pp,
        * > generally be left blank, and implementations must ignore
        * > anything that appears before the first boundary delimiter
        * > line or after the last one.
-       */
-      (void) find_boundary (pp,
+       */(void) find_boundary (pp,
                             pp->boundary,
                             pp->blen,
                             &ioff,
@@ -1290,4 +1289,5 @@ MHD_destroy_post_processor (struct MHD_PostProcessor *pp)
   return ret;
 }
 
+
 /* end of postprocessor.c */
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 968fc8c9..5adfdfa9 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -541,6 +541,7 @@ free_callback (void *cls)
   response->fd = -1;
 }
 
+
 #undef MHD_create_response_from_fd_at_offset
 
 /**
@@ -1195,6 +1196,8 @@ MHD_create_response_for_upgrade (MHD_UpgradeHandler upgrade_handler,
   }
   return response;
 }
+
+
 #endif /* UPGRADE_SUPPORT */
 
 
diff --git a/src/microhttpd/sha256.c b/src/microhttpd/sha256.c
index 846a43b7..908bbda2 100644
--- a/src/microhttpd/sha256.c
+++ b/src/microhttpd/sha256.c
@@ -62,6 +62,7 @@ MHD_SHA256_init (void *ctx_)
   ctx->count = 0;
 }
 
+
 /**
  * Number of bytes in single SHA-256 word
  * used to process data
@@ -246,6 +247,7 @@ sha256_transform (uint32_t H[_SHA256_DIGEST_LENGTH],
   H[7] += h;
 }
 
+
 /**
  * Process portion of bytes.
  *
diff --git a/src/microhttpd/test_helpers.h b/src/microhttpd/test_helpers.h
index d47f7168..993d0718 100644
--- a/src/microhttpd/test_helpers.h
+++ b/src/microhttpd/test_helpers.h
@@ -64,6 +64,7 @@ has_in_name (const char *prog_name, const char *marker)
   return strstr (prog_name + name_pos, marker) != (char*) 0;
 }
 
+
 /**
  * Check whether one of strings in array is equal to @a param.
  * String @a argv[0] is ignored.
@@ -83,7 +84,7 @@ has_param (int argc, char *const argv[], const char *param)
 
   for (i = 1; i < argc; i++)
   {
-    if (argv[i] &&(strcmp (argv[i], param) == 0) )
+    if (argv[i] && (strcmp (argv[i], param) == 0) )
       return ! 0;
   }
 
diff --git a/src/microhttpd/test_http_reasons.c b/src/microhttpd/test_http_reasons.c
index 4d0484ad..7c2c3efd 100644
--- a/src/microhttpd/test_http_reasons.c
+++ b/src/microhttpd/test_http_reasons.c
@@ -28,7 +28,8 @@
 #include "microhttpd.h"
 #include "mhd_str.h"
 
-static int expect_result (int code, const char*expected)
+static int
+expect_result (int code, const char*expected)
 {
   const char*const reason = MHD_get_reason_phrase_for (code);
   if (MHD_str_equal_caseless_ (reason, expected))
@@ -39,12 +40,16 @@ static int expect_result (int code, const char*expected)
   return 1;
 }
 
-static int expect_absent (int code)
+
+static int
+expect_absent (int code)
 {
   return expect_result (code, "unknown");
 }
 
-static int test_absent_codes (void)
+
+static int
+test_absent_codes (void)
 {
   int errcount = 0;
   errcount += expect_absent (0);
@@ -58,7 +63,9 @@ static int test_absent_codes (void)
   return errcount;
 }
 
-static int test_1xx (void)
+
+static int
+test_1xx (void)
 {
   int errcount = 0;
   errcount += expect_result (MHD_HTTP_CONTINUE, "continue");
@@ -68,7 +75,9 @@ static int test_1xx (void)
   return errcount;
 }
 
-static int test_2xx (void)
+
+static int
+test_2xx (void)
 {
   int errcount = 0;
   errcount += expect_result (MHD_HTTP_OK, "ok");
@@ -80,7 +89,9 @@ static int test_2xx (void)
   return errcount;
 }
 
-static int test_3xx (void)
+
+static int
+test_3xx (void)
 {
   int errcount = 0;
   errcount += expect_result (MHD_HTTP_MULTIPLE_CHOICES, "multiple choices");
@@ -91,7 +102,9 @@ static int test_3xx (void)
   return errcount;
 }
 
-static int test_4xx (void)
+
+static int
+test_4xx (void)
 {
   int errcount = 0;
   errcount += expect_result (MHD_HTTP_BAD_REQUEST, "bad request");
@@ -108,7 +121,9 @@ static int test_4xx (void)
   return errcount;
 }
 
-static int test_5xx (void)
+
+static int
+test_5xx (void)
 {
   int errcount = 0;
   errcount += expect_result (MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -123,7 +138,9 @@ static int test_5xx (void)
   return errcount;
 }
 
-int main (int argc, char *argv[])
+
+int
+main (int argc, char *argv[])
 {
   int errcount = 0;
   (void) argc; (void) argv; /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_options.c b/src/microhttpd/test_options.c
index be033ae8..0c0825f1 100644
--- a/src/microhttpd/test_options.c
+++ b/src/microhttpd/test_options.c
@@ -56,6 +56,7 @@ ahc_echo (void *cls,
   return 0;
 }
 
+
 static int
 test_wrap_loc (char *test_name, int (*test)(void))
 {
@@ -122,6 +123,7 @@ test_ip_addr_option ()
   return 0;
 }
 
+
 /* setup a temporary transfer test file */
 int
 main (int argc, char *const *argv)
diff --git a/src/microhttpd/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
index e1a167e7..75b5ba33 100644
--- a/src/microhttpd/test_postprocessor.c
+++ b/src/microhttpd/test_postprocessor.c
@@ -82,6 +82,7 @@ mismatch (const char *a, const char *b)
   return 0 != strcmp (a, b);
 }
 
+
 static int
 value_checker (void *cls,
                enum MHD_ValueKind kind,
@@ -347,8 +348,6 @@ test_empty_value (void)
 }
 
 
-
-
 int
 main (int argc, char *const *argv)
 {
diff --git a/src/microhttpd/test_postprocessor_amp.c b/src/microhttpd/test_postprocessor_amp.c
index e2ea4a54..54936979 100644
--- a/src/microhttpd/test_postprocessor_amp.c
+++ b/src/microhttpd/test_postprocessor_amp.c
@@ -7,10 +7,11 @@
 
 uint64_t num_errors;
 
-int check_post (void *cls, enum MHD_ValueKind kind, const char*key,
-                const char*filename, const char*content_type,
-                const char*content_encoding, const char*data,
-                uint64_t off, size_t size)
+int
+check_post (void *cls, enum MHD_ValueKind kind, const char*key,
+            const char*filename, const char*content_type,
+            const char*content_encoding, const char*data,
+            uint64_t off, size_t size)
 {
   (void) cls; (void) kind; (void) filename; (void) content_type;  /* Unused. Silent compiler warning. */
   (void) content_encoding; (void) data; (void) off; (void) size;  /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_postprocessor_large.c b/src/microhttpd/test_postprocessor_large.c
index 68e5f671..0e2a10d2 100644
--- a/src/microhttpd/test_postprocessor_large.c
+++ b/src/microhttpd/test_postprocessor_large.c
@@ -98,6 +98,7 @@ test_simple_large ()
   return 0;
 }
 
+
 int
 main (int argc, char *const *argv)
 {
diff --git a/src/microhttpd/test_sha256.c b/src/microhttpd/test_sha256.c
index da6f6e1f..54cdf027 100644
--- a/src/microhttpd/test_sha256.c
+++ b/src/microhttpd/test_sha256.c
@@ -285,6 +285,7 @@ bin2hex (const uint8_t *bin,
   *hex = 0;
 }
 
+
 static int
 check_result (const char *test_name,
               unsigned int check_num,
@@ -365,6 +366,7 @@ test1_bin (void)
   return num_failed;
 }
 
+
 /* Calculated SHA-256 as two iterations for whole data */
 static int
 test2_str (void)
diff --git a/src/microhttpd/test_shutdown_select.c b/src/microhttpd/test_shutdown_select.c
index ae88658d..121c38cc 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -255,6 +255,8 @@ poll_thread (void*data)
 
   return (MHD_THRD_RTRN_TYPE_) 0;
 }
+
+
 #endif /* HAVE_POLL */
 
 
@@ -306,7 +308,7 @@ main (int argc, char *const *argv)
   ver_req = MAKEWORD (2, 2);
 
   err = WSAStartup (ver_req, &wsa_data);
-  if ((err != 0)||(MAKEWORD (2, 2) != wsa_data.wVersion))
+  if ((err != 0) || (MAKEWORD (2, 2) != wsa_data.wVersion))
   {
     printf ("WSAStartup() failed\n");
     WSACleanup ();
@@ -370,7 +372,7 @@ main (int argc, char *const *argv)
     /* fprintf (stdout, "Thread finished.\n"); */
     MHD_socket_close_chk_ (listen_socket);
 
-    if ((start_t == (time_t) -1) ||(end_t == (time_t) -1) )
+    if ((start_t == (time_t) -1) || (end_t == (time_t) -1) )
     {
       MHD_socket_close_chk_ (listen_socket);
       fprintf (stderr, "Can't get current time\n");
diff --git a/src/microhttpd/test_start_stop.c b/src/microhttpd/test_start_stop.c
index 541cc5c5..c2f1781b 100644
--- a/src/microhttpd/test_start_stop.c
+++ b/src/microhttpd/test_start_stop.c
@@ -67,6 +67,7 @@ testInternalGet (int poll_flag)
   return 0;
 }
 
+
 static int
 testMultithreadedGet (int poll_flag)
 {
@@ -97,6 +98,8 @@ testMultithreadedPoolGet (int poll_flag)
   MHD_stop_daemon (d);
   return 0;
 }
+
+
 #endif
 
 
diff --git a/src/microhttpd/test_str.c b/src/microhttpd/test_str.c
index 8739a23a..a2f357b4 100644
--- a/src/microhttpd/test_str.c
+++ b/src/microhttpd/test_str.c
@@ -208,7 +208,8 @@ static const unsigned int locale_name_count = sizeof(locale_names)
  *  Helper functions
  */
 
-int set_test_locale (unsigned int num)
+int
+set_test_locale (unsigned int num)
 {
   if (num >= locale_name_count)
     return -1;
@@ -225,17 +226,21 @@ int set_test_locale (unsigned int num)
   return 0;
 }
 
-const char *get_current_locale_str (void)
+
+const char *
+get_current_locale_str (void)
 {
   char const *loc_str = setlocale (LC_ALL, NULL);
   return loc_str ? loc_str : "unknown";
 }
 
+
 static char tmp_bufs[4][4 * 1024]; /* should be enough for testing */
 static size_t buf_idx = 0;
 
 /* print non-printable chars as char codes */
-char *n_prnt (const char *str)
+char *
+n_prnt (const char *str)
 {
   static char *buf;  /* should be enough for testing */
   static const size_t buf_size = sizeof(tmp_bufs[0]);
@@ -248,14 +253,14 @@ char *n_prnt (const char *str)
   while (*p && w_pos + 1 < buf_size)
   {
     const unsigned char c = *p;
-    if ((c == '\\') ||(c == '"') )
+    if ((c == '\\') || (c == '"') )
     {
       if (w_pos + 2 >= buf_size)
         break;
       buf[w_pos++] = '\\';
       buf[w_pos++] = c;
     }
-    else if ((c >= 0x20) &&(c <= 0x7E) )
+    else if ((c >= 0x20) && (c <= 0x7E) )
       buf[w_pos++] = c;
     else
     {
@@ -497,7 +502,8 @@ static const struct two_neq_strs neq_strings[] = {
 };
 
 
-int check_eq_strings (void)
+int
+check_eq_strings (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -532,7 +538,7 @@ int check_eq_strings (void)
                  " Locale: %s\n", n_prnt (t->s2.str), n_prnt (t->s1.str),
                  get_current_locale_str ());
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf ("PASSED: MHD_str_equal_caseless_(\"%s\", \"%s\") != 0 && \\\n"
                 "        MHD_str_equal_caseless_(\"%s\", \"%s\") != 0\n",
                 n_prnt (t->s1.str), n_prnt (t->s2.str),
@@ -542,7 +548,9 @@ int check_eq_strings (void)
   return t_failed;
 }
 
-int check_neq_strings (void)
+
+int
+check_neq_strings (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -577,7 +585,7 @@ int check_neq_strings (void)
                  " Locale: %s\n", n_prnt (t->s2.str), n_prnt (t->s1.str),
                  get_current_locale_str ());
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf ("PASSED: MHD_str_equal_caseless_(\"%s\", \"%s\") == 0 && \\\n"
                 "        MHD_str_equal_caseless_(\"%s\", \"%s\") == 0\n",
                 n_prnt (t->s1.str), n_prnt (t->s2.str),
@@ -587,7 +595,9 @@ int check_neq_strings (void)
   return t_failed;
 }
 
-int check_eq_strings_n (void)
+
+int
+check_eq_strings_n (void)
 {
   size_t t_failed = 0;
   size_t i, j, k;
@@ -627,7 +637,7 @@ int check_eq_strings_n (void)
                    get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_equal_caseless_n_(\"%s\", \"%s\", N) != 0 && \\\n"
           "        MHD_str_equal_caseless_n_(\"%s\", \"%s\", N) != 0, where N is 0..%u\n",
@@ -638,7 +648,9 @@ int check_eq_strings_n (void)
   return t_failed;
 }
 
-int check_neq_strings_n (void)
+
+int
+check_neq_strings_n (void)
 {
   size_t t_failed = 0;
   size_t i, j, k;
@@ -732,7 +744,7 @@ int check_neq_strings_n (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
       {
         printf (
           "PASSED: MHD_str_equal_caseless_n_(\"%s\", \"%s\", N) != 0 && \\\n"
@@ -753,10 +765,12 @@ int check_neq_strings_n (void)
   return t_failed;
 }
 
+
 /*
  * Run eq/neq strings tests
  */
-int run_eq_neq_str_tests (void)
+int
+run_eq_neq_str_tests (void)
 {
   int str_equal_caseless_fails = 0;
   int str_equal_caseless_n_fails = 0;
@@ -851,6 +865,7 @@ int run_eq_neq_str_tests (void)
   return 0;
 }
 
+
 /*
  * Digits in string -> value tests
  */
@@ -1118,7 +1133,8 @@ const struct str_with_len strx_ovflw[] = {
 };
 
 
-int check_str_to_uint64_valid (void)
+int
+check_str_to_uint64_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1175,7 +1191,7 @@ int check_str_to_uint64_valid (void)
                    t->str.str), rv, rv,
                  t->val, get_current_locale_str ());
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_(\"%s\", ->%" PRIu64 ") == %" PRIuPTR "\n",
           n_prnt (t->str.str), rv, rs);
@@ -1185,7 +1201,8 @@ int check_str_to_uint64_valid (void)
 }
 
 
-int check_str_to_uint64_all_chars (void)
+int
+check_str_to_uint64_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -1204,9 +1221,9 @@ int check_str_to_uint64_all_chars (void)
     {
       static const uint64_t rnd_val = 24941852;
       size_t rs;
-      if ((c >= '0') &&(c <= '9') )
+      if ((c >= '0') && (c <= '9') )
         continue;     /* skip digits */
-      for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+      for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
              rnd_val)
       {
         char test_str[] = "0123";
@@ -1236,7 +1253,7 @@ int check_str_to_uint64_all_chars (void)
                    n_prnt (test_str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -1251,7 +1268,8 @@ int check_str_to_uint64_all_chars (void)
 }
 
 
-int check_str_to_uint64_overflow (void)
+int
+check_str_to_uint64_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1298,7 +1316,7 @@ int check_str_to_uint64_overflow (void)
                    n_prnt (t->str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (t->str));
@@ -1308,7 +1326,8 @@ int check_str_to_uint64_overflow (void)
 }
 
 
-int check_str_to_uint64_no_val (void)
+int
+check_str_to_uint64_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1355,7 +1374,7 @@ int check_str_to_uint64_no_val (void)
                    n_prnt (t->str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (t->str));
@@ -1365,7 +1384,8 @@ int check_str_to_uint64_no_val (void)
 }
 
 
-int check_str_to_uint64_n_valid (void)
+int
+check_str_to_uint64_n_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1423,7 +1443,7 @@ int check_str_to_uint64_n_valid (void)
                    t->val, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR ", ->%"
           PRIu64 ")"
@@ -1436,7 +1456,8 @@ int check_str_to_uint64_n_valid (void)
 }
 
 
-int check_str_to_uint64_n_all_chars (void)
+int
+check_str_to_uint64_n_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -1457,12 +1478,12 @@ int check_str_to_uint64_n_all_chars (void)
       size_t rs;
       size_t len;
 
-      if ((c >= '0') &&(c <= '9') )
+      if ((c >= '0') && (c <= '9') )
         continue;     /* skip digits */
 
       for (len = 0; len <= 5; len++)
       {
-        for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+        for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
                rnd_val)
         {
           char test_str[] = "0123";
@@ -1497,7 +1518,7 @@ int check_str_to_uint64_n_all_chars (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -1512,7 +1533,8 @@ int check_str_to_uint64_n_all_chars (void)
 }
 
 
-int check_str_to_uint64_n_overflow (void)
+int
+check_str_to_uint64_n_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1567,7 +1589,7 @@ int check_str_to_uint64_n_overflow (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -1580,7 +1602,8 @@ int check_str_to_uint64_n_overflow (void)
 }
 
 
-int check_str_to_uint64_n_no_val (void)
+int
+check_str_to_uint64_n_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1635,7 +1658,7 @@ int check_str_to_uint64_n_no_val (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_str_to_uint64_n_(\"%s\", 0..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -1647,7 +1670,8 @@ int check_str_to_uint64_n_no_val (void)
 }
 
 
-int check_strx_to_uint32_valid (void)
+int
+check_strx_to_uint32_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1708,7 +1732,7 @@ int check_strx_to_uint32_valid (void)
                    t->str.str), (uint64_t) rv, (uint64_t) rv,
                  t->val, get_current_locale_str ());
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_(\"%s\", ->0x%" PRIX64 ") == %" PRIuPTR
           "\n",
@@ -1719,7 +1743,8 @@ int check_strx_to_uint32_valid (void)
 }
 
 
-int check_strx_to_uint32_all_chars (void)
+int
+check_strx_to_uint32_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -1738,12 +1763,13 @@ int check_strx_to_uint32_all_chars (void)
     {
       static const uint32_t rnd_val = 234234;
       size_t rs;
-      if (((c >= '0') &&(c <= '9') ) || ((c >= 'A') &&(c <= 'F') ) ||((c >=
-                                                                       'a') &&
-                                                                      (c <=
-                                                                       'f') ))
+      if (((c >= '0') && (c <= '9') ) || ((c >= 'A') && (c <= 'F') ) || ((c >=
+                                                                          'a')
+                                                                         &&
+                                                                         (c <=
+                                                                          'f') ))
         continue;     /* skip xdigits */
-      for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+      for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
              rnd_val)
       {
         char test_str[] = "0123";
@@ -1774,7 +1800,7 @@ int check_strx_to_uint32_all_chars (void)
                    get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -1789,7 +1815,8 @@ int check_strx_to_uint32_all_chars (void)
 }
 
 
-int check_strx_to_uint32_overflow (void)
+int
+check_strx_to_uint32_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1854,7 +1881,7 @@ int check_strx_to_uint32_overflow (void)
                    get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (str));
@@ -1864,7 +1891,8 @@ int check_strx_to_uint32_overflow (void)
 }
 
 
-int check_strx_to_uint32_no_val (void)
+int
+check_strx_to_uint32_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1912,7 +1940,7 @@ int check_strx_to_uint32_no_val (void)
                    get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (t->str));
@@ -1922,7 +1950,8 @@ int check_strx_to_uint32_no_val (void)
 }
 
 
-int check_strx_to_uint32_n_valid (void)
+int
+check_strx_to_uint32_n_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -1984,7 +2013,7 @@ int check_strx_to_uint32_n_valid (void)
                    t->val, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR
           ", ->0x%"
@@ -1998,7 +2027,8 @@ int check_strx_to_uint32_n_valid (void)
 }
 
 
-int check_strx_to_uint32_n_all_chars (void)
+int
+check_strx_to_uint32_n_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -2019,15 +2049,16 @@ int check_strx_to_uint32_n_all_chars (void)
       size_t rs;
       size_t len;
 
-      if (((c >= '0') &&(c <= '9') ) || ((c >= 'A') &&(c <= 'F') ) || ((c >=
-                                                                        'a') &&
-                                                                       (c <=
-                                                                        'f') ))
+      if (((c >= '0') && (c <= '9') ) || ((c >= 'A') && (c <= 'F') ) || ((c >=
+                                                                          'a')
+                                                                         &&
+                                                                         (c <=
+                                                                          'f') ))
         continue;     /* skip xdigits */
 
       for (len = 0; len <= 5; len++)
       {
-        for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+        for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
                rnd_val)
         {
           char test_str[] = "0123";
@@ -2063,7 +2094,7 @@ int check_strx_to_uint32_n_all_chars (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -2078,7 +2109,8 @@ int check_strx_to_uint32_n_all_chars (void)
 }
 
 
-int check_strx_to_uint32_n_overflow (void)
+int
+check_strx_to_uint32_n_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2166,7 +2198,7 @@ int check_strx_to_uint32_n_overflow (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -2179,7 +2211,8 @@ int check_strx_to_uint32_n_overflow (void)
 }
 
 
-int check_strx_to_uint32_n_no_val (void)
+int
+check_strx_to_uint32_n_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2235,7 +2268,7 @@ int check_strx_to_uint32_n_no_val (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint32_n_(\"%s\", 0..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -2247,7 +2280,8 @@ int check_strx_to_uint32_n_no_val (void)
 }
 
 
-int check_strx_to_uint64_valid (void)
+int
+check_strx_to_uint64_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2304,7 +2338,7 @@ int check_strx_to_uint64_valid (void)
                    t->str.str), rv, rv,
                  t->val, get_current_locale_str ());
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_(\"%s\", ->0x%" PRIX64 ") == %" PRIuPTR
           "\n",
@@ -2315,7 +2349,8 @@ int check_strx_to_uint64_valid (void)
 }
 
 
-int check_strx_to_uint64_all_chars (void)
+int
+check_strx_to_uint64_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -2334,12 +2369,13 @@ int check_strx_to_uint64_all_chars (void)
     {
       static const uint64_t rnd_val = 234234;
       size_t rs;
-      if (((c >= '0') &&(c <= '9') ) || ((c >= 'A') &&(c <= 'F') ) || ((c >=
-                                                                        'a') &&
-                                                                       (c <=
-                                                                        'f') ))
+      if (((c >= '0') && (c <= '9') ) || ((c >= 'A') && (c <= 'F') ) || ((c >=
+                                                                          'a')
+                                                                         &&
+                                                                         (c <=
+                                                                          'f') ))
         continue;     /* skip xdigits */
-      for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+      for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
              rnd_val)
       {
         char test_str[] = "0123";
@@ -2369,7 +2405,7 @@ int check_strx_to_uint64_all_chars (void)
                    n_prnt (test_str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -2384,7 +2420,8 @@ int check_strx_to_uint64_all_chars (void)
 }
 
 
-int check_strx_to_uint64_overflow (void)
+int
+check_strx_to_uint64_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2431,7 +2468,7 @@ int check_strx_to_uint64_overflow (void)
                    n_prnt (t->str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (t->str));
@@ -2441,7 +2478,8 @@ int check_strx_to_uint64_overflow (void)
 }
 
 
-int check_strx_to_uint64_no_val (void)
+int
+check_strx_to_uint64_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2488,7 +2526,7 @@ int check_strx_to_uint64_no_val (void)
                    n_prnt (t->str), test_val, rv, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_(\"%s\", &ret_val) == 0, value of ret_val is unmodified\n",
           n_prnt (t->str));
@@ -2498,7 +2536,8 @@ int check_strx_to_uint64_no_val (void)
 }
 
 
-int check_strx_to_uint64_n_valid (void)
+int
+check_strx_to_uint64_n_valid (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2556,7 +2595,7 @@ int check_strx_to_uint64_n_valid (void)
                    t->val, get_current_locale_str ());
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR
           ", ->0x%"
@@ -2570,7 +2609,8 @@ int check_strx_to_uint64_n_valid (void)
 }
 
 
-int check_strx_to_uint64_n_all_chars (void)
+int
+check_strx_to_uint64_n_all_chars (void)
 {
   static const size_t n_checks = 256; /* from 0 to 255 */
   int c_failed[n_checks];
@@ -2591,15 +2631,16 @@ int check_strx_to_uint64_n_all_chars (void)
       size_t rs;
       size_t len;
 
-      if (((c >= '0') &&(c <= '9') ) || ((c >= 'A') &&(c <= 'F') ) || ((c >=
-                                                                        'a') &&
-                                                                       (c <=
-                                                                        'f') ))
+      if (((c >= '0') && (c <= '9') ) || ((c >= 'A') && (c <= 'F') ) || ((c >=
+                                                                          'a')
+                                                                         &&
+                                                                         (c <=
+                                                                          'f') ))
         continue;     /* skip xdigits */
 
       for (len = 0; len <= 5; len++)
       {
-        for (test_val = 0; test_val <= rnd_val&& ! c_failed[c]; test_val +=
+        for (test_val = 0; test_val <= rnd_val && ! c_failed[c]; test_val +=
                rnd_val)
         {
           char test_str[] = "0123";
@@ -2635,7 +2676,7 @@ int check_strx_to_uint64_n_all_chars (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[c])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[c])
       {
         char test_str[] = "0123";
         test_str[0] = (char) (unsigned char) c;      /* replace first char with non-digit char */
@@ -2650,7 +2691,8 @@ int check_strx_to_uint64_n_all_chars (void)
 }
 
 
-int check_strx_to_uint64_n_overflow (void)
+int
+check_strx_to_uint64_n_overflow (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2706,7 +2748,7 @@ int check_strx_to_uint64_n_overflow (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_n_(\"%s\", %" PRIuPTR "..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -2719,7 +2761,8 @@ int check_strx_to_uint64_n_overflow (void)
 }
 
 
-int check_strx_to_uint64_n_no_val (void)
+int
+check_strx_to_uint64_n_no_val (void)
 {
   size_t t_failed = 0;
   size_t i, j;
@@ -2775,7 +2818,7 @@ int check_strx_to_uint64_n_no_val (void)
           }
         }
       }
-      if ((verbose > 1) &&(j == locale_name_count - 1) && ! c_failed[i])
+      if ((verbose > 1) && (j == locale_name_count - 1) && ! c_failed[i])
         printf (
           "PASSED: MHD_strx_to_uint64_n_(\"%s\", 0..%" PRIuPTR
           ", &ret_val) == 0,"
@@ -2787,7 +2830,8 @@ int check_strx_to_uint64_n_no_val (void)
 }
 
 
-int run_str_to_X_tests (void)
+int
+run_str_to_X_tests (void)
 {
   int str_to_uint64_fails = 0;
   int str_to_uint64_n_fails = 0;
@@ -3270,7 +3314,8 @@ int run_str_to_X_tests (void)
 }
 
 
-int main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
   if (has_param (argc, argv, "-v") || has_param (argc, argv, "--verbose") ||
       has_param (argc, argv, "--verbose1"))
diff --git a/src/microhttpd/test_str_token.c b/src/microhttpd/test_str_token.c
index 0baca53d..1e1eab28 100644
--- a/src/microhttpd/test_str_token.c
+++ b/src/microhttpd/test_str_token.c
@@ -41,6 +41,7 @@ expect_found_n (const char *str, const char *token, size_t token_len)
   return 0;
 }
 
+
 #define expect_found(s,t) expect_found_n ((s),(t),MHD_STATICSTR_LEN_ (t))
 
 static int
@@ -56,10 +57,12 @@ expect_not_found_n (const char *str, const char *token, size_t token_len)
   return 0;
 }
 
+
 #define expect_not_found(s,t) expect_not_found_n ((s),(t),MHD_STATICSTR_LEN_ ( \
                                                     t))
 
-int check_match (void)
+int
+check_match (void)
 {
   int errcount = 0;
   errcount += expect_found ("string", "string");
@@ -85,7 +88,9 @@ int check_match (void)
   return errcount;
 }
 
-int check_not_match (void)
+
+int
+check_not_match (void)
 {
   int errcount = 0;
   errcount += expect_not_found ("strin", "string");
@@ -111,7 +116,9 @@ int check_not_match (void)
   return errcount;
 }
 
-int main (int argc, char *argv[])
+
+int
+main (int argc, char *argv[])
 {
   int errcount = 0;
   (void) argc; (void) argv; /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index dbfa847d..404c2854 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -139,6 +139,8 @@ gnutlscli_connect (int *sock,
   }
   _exit (1);
 }
+
+
 #endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
 
 
@@ -296,14 +298,14 @@ wr_connect (struct wr_socket *s,
      * it require processing on MHD side and
      * when testing with "external" polling,
      * test will call MHD processing only
-     * after return from wr_connect(). */
-    s->tls_connected = 0;
+     * after return from wr_connect(). */s->tls_connected = 0;
     return 0;
   }
 #endif /* HTTPS_SUPPORT */
   return -1;
 }
 
+
 #ifdef HTTPS_SUPPORT
 /* Only to be called from wr_send() and wr_recv() ! */
 static bool
@@ -318,6 +320,8 @@ wr_handshake (struct wr_socket *s)
     MHD_socket_set_error_ (MHD_SCKT_ECONNABORTED_); /* hard error */
   return s->tls_connected;
 }
+
+
 #endif /* HTTPS_SUPPORT */
 
 
@@ -924,6 +928,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
   }
 }
 
+
 #ifdef HAVE_POLL
 
 /**
@@ -937,6 +942,8 @@ run_mhd_poll_loop (struct MHD_Daemon *daemon)
   (void) daemon; /* Unused. Silent compiler warning. */
   abort (); /* currently not implementable with existing MHD API */
 }
+
+
 #endif /* HAVE_POLL */
 
 
@@ -983,6 +990,8 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
     MHD_run (daemon);
   }
 }
+
+
 #endif /* EPOLL_SUPPORT */
 
 /**
@@ -1076,7 +1085,7 @@ test_upgrade (int flags,
   if ( (NULL == dinfo) ||
        (0 == dinfo->port) )
     abort ();
-  if (! test_tls ||(TLS_LIB_GNUTLS == use_tls_tool))
+  if (! test_tls || (TLS_LIB_GNUTLS == use_tls_tool))
   {
     sock = test_tls ? wr_create_tls_sckt () : wr_create_plain_sckt ();
     if (NULL == sock)
@@ -1134,7 +1143,7 @@ test_upgrade (int flags,
   pthread_join (pt,
                 NULL);
 #if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
-  if (test_tls &&(TLS_LIB_GNUTLS != use_tls_tool))
+  if (test_tls && (TLS_LIB_GNUTLS != use_tls_tool))
     waitpid (pid, NULL, 0);
 #endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
   MHD_stop_daemon (d);
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index 9ad15578..a17293db 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -149,6 +149,8 @@ gnutlscli_connect (int *sock,
   }
   _exit (1);
 }
+
+
 #endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
 
 
@@ -306,14 +308,14 @@ wr_connect (struct wr_socket *s,
      * it require processing on MHD side and
      * when testing with "external" polling,
      * test will call MHD processing only
-     * after return from wr_connect(). */
-    s->tls_connected = 0;
+     * after return from wr_connect(). */s->tls_connected = 0;
     return 0;
   }
 #endif /* HTTPS_SUPPORT */
   return -1;
 }
 
+
 #ifdef HTTPS_SUPPORT
 /* Only to be called from wr_send() and wr_recv() ! */
 static bool
@@ -328,6 +330,8 @@ wr_handshake (struct wr_socket *s)
     MHD_socket_set_error_ (MHD_SCKT_ECONNABORTED_); /* hard error */
   return s->tls_connected;
 }
+
+
 #endif /* HTTPS_SUPPORT */
 
 
@@ -958,6 +962,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
   kicker[1] = -1;
 }
 
+
 #ifdef HAVE_POLL
 
 /**
@@ -971,6 +976,8 @@ run_mhd_poll_loop (struct MHD_Daemon *daemon)
   (void) daemon; /* Unused. Silent compiler warning. */
   abort (); /* currently not implementable with existing MHD API */
 }
+
+
 #endif /* HAVE_POLL */
 
 
@@ -1026,6 +1033,8 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
   kicker[0] = -1;
   kicker[1] = -1;
 }
+
+
 #endif /* EPOLL_SUPPORT */
 
 /**
@@ -1121,7 +1130,7 @@ test_upgrade (int flags,
   if ( (NULL == dinfo) ||
        (0 == dinfo->port) )
     abort ();
-  if (! test_tls ||(TLS_LIB_GNUTLS == use_tls_tool))
+  if (! test_tls || (TLS_LIB_GNUTLS == use_tls_tool))
   {
     sock = test_tls ? wr_create_tls_sckt () : wr_create_plain_sckt ();
     if (NULL == sock)
@@ -1179,7 +1188,7 @@ test_upgrade (int flags,
   pthread_join (pt,
                 NULL);
 #if defined(HTTPS_SUPPORT) && defined(HAVE_FORK) && defined(HAVE_WAITPID)
-  if (test_tls &&(TLS_LIB_GNUTLS != use_tls_tool))
+  if (test_tls && (TLS_LIB_GNUTLS != use_tls_tool))
     waitpid (pid, NULL, 0);
 #endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
   MHD_stop_daemon (d);
diff --git a/src/microhttpd/tsearch.c b/src/microhttpd/tsearch.c
index e43d758f..78f37608 100644
--- a/src/microhttpd/tsearch.c
+++ b/src/microhttpd/tsearch.c
@@ -102,7 +102,7 @@ tdelete (const void *__restrict vkey,
   node_t *r;
   int cmp;
 
-  if ((rootp == NULL)||((p = *rootp) == NULL))
+  if ((rootp == NULL) || ((p = *rootp) == NULL))
     return NULL;
 
   while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0)
@@ -140,4 +140,5 @@ tdelete (const void *__restrict vkey,
   return p;
 }
 
+
 /* end of tsearch.c */