cosmetic fixes

src/examples/chunked_example.c

@@ -57,7 +57,8 @@ callback (void *cls,
       // Consider suspending connection until data will be ready.
       return 0;
     }
-   * End of pseudo code. */if (buf_size < (param->response_size - pos))
+   * End of pseudo code. */
+  if (buf_size < (param->response_size - pos))
     size_to_copy = buf_size;
   else
     size_to_copy = param->response_size - pos;
@@ -70,7 +71,9 @@ callback (void *cls,
       // Close connection with error.
       return MHD_CONTENT_READER_END_WITH_ERROR;
     }
-   * End of pseudo code. *//* Return amount of data copied to buffer. */return size_to_copy;
+   * End of pseudo code. */
+  /* Return amount of data copied to buffer. */
+  return size_to_copy;
 }
 
 

src/microhttpd/connection.c

@@ -656,7 +656,8 @@ 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,
@@ -763,7 +764,7 @@ 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.
-   *///
+   */
 }
 
 
@@ -1177,7 +1178,7 @@ try_grow_read_buffer (struct MHD_Connection *connection,
        the right position in the pool, say because someone called
        MHD_pool_allocate() without 'from_end' set to 'true'? Anyway,
        should be investigated! (Ideally provide all data from
-       *pool and connection->read_buffer and new_size for debugging). *///
+       *pool and connection->read_buffer and new_size for debugging). */
     mhd_assert (0);
     return false;
   }
@@ -1403,7 +1404,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
         = MHD_snprintf_ (content_length_buf,
                          sizeof (content_length_buf),
@@ -1737,7 +1738,8 @@ 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;
@@ -2511,7 +2513,8 @@ 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;
 }
@@ -2558,7 +2561,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. *///
+ ability to grow nicely. */
     last = MHD_pool_reallocate (connection->pool,
                                 last,
                                 last_len + 1,

src/microhttpd/daemon.c

@@ -1232,8 +1232,10 @@ 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)
     {
@@ -1367,7 +1369,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. *///
+     * 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. */
@@ -1386,7 +1388,7 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
    * 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. *///
+   * 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))
@@ -3396,7 +3398,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. *///
+           system. */
         if (0 != epoll_ctl (daemon->epoll_fd,
                             EPOLL_CTL_DEL,
                             pos->socket_fd,

src/microhttpd/digestauth.c

@@ -555,7 +555,8 @@ 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
@@ -955,7 +956,8 @@ 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 */
@@ -978,7 +980,8 @@ 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;
@@ -1025,7 +1028,8 @@ 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_NO ==
+   */
+  if (MHD_NO ==
       check_nonce_nc (connection,
                       nonce,
                       nci))
@@ -1199,7 +1203,7 @@ MHD_digest_auth_check (struct MHD_Connection *connection,
       da.digest = &MHD_MD5Final;                        \
       break;                                        \
     case MHD_DIGEST_ALG_AUTO:                             \
-    /* auto == SHA256, fall-though thus intentional! */ \
+  /* auto == SHA256, fall-though thus intentional! */ \
     case MHD_DIGEST_ALG_SHA256:                           \
       da.digest_size = SHA256_DIGEST_SIZE;                \
       da.ctx = &ctx.sha256;                               \

src/microhttpd/mhd_send.c

@@ -584,7 +584,8 @@ 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) ||

src/microhttpd/mhd_threads.c

@@ -81,7 +81,8 @@ 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 */
 }
 
@@ -311,7 +312,8 @@ 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)

src/microhttpd/postprocessor.c

@@ -1212,7 +1212,8 @@ 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,

src/microhttpd/test_upgrade.c

@@ -298,7 +298,8 @@ 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 */

src/microhttpd/test_upgrade_large.c

@@ -463,7 +463,8 @@ 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 */

src/testcurl/curl_version_check.c

@@ -103,7 +103,8 @@ curl_check_version (const char *req_version)
    * this call relies on the cURL string to be of the exact following format :
    * 'libcurl/7.16.4 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/0.6.5' OR
    * 'libcurl/7.18.2 GnuTLS/2.4.0 zlib/1.2.3.3 libidn/0.6.5'
-   */curl_ver = strchr (ver, '/');
+   */
+  curl_ver = strchr (ver, '/');
   if (curl_ver == NULL)
     return -1;
   curl_ver++;

src/testcurl/perf_get.c

@@ -569,7 +569,8 @@ testExternalGet (int port)
          in actual runtime right now, even though the
          number of select calls is virtually cut in half
          (and 'select' is the most expensive of our system
-         calls according to 'strace') */if (0)
+         calls according to 'strace') */
+      if (0)
         MHD_run (d);
       else
         MHD_run_from_select (d, &rs, &ws, &es);