applying uncrustify to ensure uniform indentation

author: Christian Grothoff <christian@grothoff.org> 2019-10-17 16:56:41 +0200
committer: Christian Grothoff <christian@grothoff.org> 2019-10-17 16:56:41 +0200
commit: 972103dc288e2a2396e060018e7c3733f29a940d (patch)
tree: aeb0b3a182d5168f12752928d3204342c9581e91
parent: cbbfd0591fc639ddd21a5850f54f403fb7394174 (diff)
download: libmicrohttpd-972103dc288e2a2396e060018e7c3733f29a940d.tar.gz
libmicrohttpd-972103dc288e2a2396e060018e7c3733f29a940d.zip
228 files changed, 25846 insertions, 24385 deletions
diff --git a/.gitignore b/.gitignore
index 88f8ab32..46beb093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ po/configargs.stamp
 **~
 doc/libmicrohttpd.log
 src/examples/suspend_resume_epoll
+uncrustify.cfg
diff --git a/bootstrap b/bootstrap
index dce3249e..7e150794 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,4 +8,27 @@ fi
 test -n "$bs_scrdir" && cd "$bs_scrdir" || echo "Warning: cannot get sources directory" 1>&2
-autoreconf -I m4 -i ${1+"$@"}
+# This is more portable than `which' but comes with
+# the caveat of not(?) properly working on busybox's ash:
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+if existence uncrustify; then
+    echo "Installing uncrustify hook and configuration"
+    # Install uncrustify format symlink (if possible)
+    ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
+    # Install pre-commit hook (if possible)
+    ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
+else
+    echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development"
+fi
+if existence libtool || existence libtoolize || existence glibtoolize || existence slibtool; then
+    autoreconf -I m4 -i ${1+"$@"}
+else
+    echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2;
+    exit 1
+fi
diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index 6ced05d7..f56c8e73 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -4,7 +4,7 @@ output_tab_size = 2
 indent_columns = 2
 indent_with_tabs = 0
 indent_case_brace = 2
-indent_label=0
+indent_label=-16
 code_width=80
 #cmd_width=80
diff --git a/contrib/uncrustify_precommit b/contrib/uncrustify_precommit
new file mode 100755
index 00000000..fd29998c
--- /dev/null
+++ b/contrib/uncrustify_precommit
@@ -0,0 +1,35 @@
+#!/bin/sh
+# use as .git/hooks/pre-commit
+exec 1>&2
+RET=0
+changed=$(git diff --cached --name-only)
+crustified=""
+for f in $changed;
+do
+ if echo $f | grep \\.[c,h]\$ > /dev/null
+ then
+    # compare result of uncrustify with changes
+    #
+    # only change any of the invocations here if
+    # they are portable across all cmp and shell
+    # implementations !
+    uncrustify -q -c uncrustify.cfg -f $f | cmp -s $f -
+    if test $? = 1 ;
+    then
+      crustified=" $crustified $f"
+      RET=1
+    fi
+  fi
+done
+if [ $RET = 1 ];
+then
+  echo "Run"
+  echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}"
+  echo "before commiting."
+fi
+exit $RET
diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c
index d8a88203..c07d7827 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -32,9 +32,11 @@
 #include <windows.h>
 #endif
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
-#define DENIED "<html><head><title>Access denied</title></head><body>Access denied</body></html>"
+#define DENIED \
+  "<html><head><title>Access denied</title></head><body>Access denied</body></html>"
@@ -53,19 +55,19 @@ ahc_echo (void *cls,
  char *user;
  char *pass;
  int fail;
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  *ptr = NULL;                  /* reset when done */
  /* require: "Aladdin" with password "open sesame" */
@@ -77,18 +79,18 @@ ahc_echo (void *cls,
           (0 != strcmp (pass, "open sesame") ) );
  if (fail)
  {
-      response = MHD_create_response_from_buffer (strlen (DENIED),
+    response = MHD_create_response_from_buffer (strlen (DENIED),
-                                                  (void *) DENIED,
+                                                (void *) DENIED,
-                                                  MHD_RESPMEM_PERSISTENT);
+                                                MHD_RESPMEM_PERSISTENT);
-      ret = MHD_queue_basic_auth_fail_response (connection,"TestRealm",response);
+    ret = MHD_queue_basic_auth_fail_response (connection,"TestRealm",response);
-    }
+  }
  else
-    {
+  {
-      response = MHD_create_response_from_buffer (strlen (me),
+    response = MHD_create_response_from_buffer (strlen (me),
-                                                  (void *) me,
+                                                (void *) me,
-                                                  MHD_RESPMEM_PERSISTENT);
+                                                MHD_RESPMEM_PERSISTENT);
-      ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+    ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-    }
+  }
  if (NULL != user)
    MHD_free (user);
  if (NULL != pass)
@@ -107,13 +109,14 @@ main (int argc, char *const *argv)
  if ( (argc != 2) ||
       (1 != sscanf (argv[1], "%u", &port)) ||
       (UINT16_MAX < port) )
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "%s PORT\n", argv[0]);
+             "%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION
+                        | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
  if (d == NULL)
diff --git a/src/examples/benchmark.c b/src/examples/benchmark.c
index 9512b9bf..2a8fb179 100644
--- a/src/examples/benchmark.c
+++ b/src/examples/benchmark.c
@@ -25,14 +25,15 @@
 #include "platform.h"
 #include <microhttpd.h>
-#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2
+#if defined(CPU_COUNT) && (CPU_COUNT + 0) < 2
 #undef CPU_COUNT
 #endif
-#if !defined(CPU_COUNT)
+#if ! defined(CPU_COUNT)
 #define CPU_COUNT 2
 #endif
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 #define SMALL (1024 * 128)
@@ -62,16 +63,16 @@ static struct MHD_Response *response;
 */
 static void
 completed_callback (void *cls,
-                    struct MHD_Connection *connection,
+                    struct MHD_Connection *connection,
-                    void **con_cls,
+                    void **con_cls,
-                    enum MHD_RequestTerminationCode toe)
+                    enum MHD_RequestTerminationCode toe)
 {
  struct timeval *tv = *con_cls;
  struct timeval tve;
  uint64_t delta;
-  (void)cls;         /* Unused. Silent compiler warning. */
+  (void) cls;         /* Unused. Silent compiler warning. */
-  (void)connection;  /* Unused. Silent compiler warning. */
+  (void) connection;  /* Unused. Silent compiler warning. */
-  (void)toe;         /* Unused. Silent compiler warning. */
+  (void) toe;         /* Unused. Silent compiler warning. */
  if (NULL == tv)
    return;
@@ -80,10 +81,10 @@ completed_callback (void *cls,
  delta = 0;
  if (tve.tv_usec >= tv->tv_usec)
    delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
-      + (tve.tv_usec - tv->tv_usec);
+             + (tve.tv_usec - tv->tv_usec);
  else
    delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
-      - tv->tv_usec + tve.tv_usec;
+             - tv->tv_usec + tve.tv_usec;
  if (delta < SMALL)
    small_deltas[delta]++;
  else
@@ -94,11 +95,11 @@ completed_callback (void *cls,
 static void *
 uri_logger_cb (void *cls,
-               const char *uri)
+               const char *uri)
 {
  struct timeval *tv = malloc (sizeof (struct timeval));
-  (void)cls; /* Unused. Silent compiler warning. */
+  (void) cls; /* Unused. Silent compiler warning. */
-  (void)uri; /* Unused. Silent compiler warning. */
+  (void) uri; /* Unused. Silent compiler warning. */
  if (NULL != tv)
    gettimeofday (tv, NULL);
@@ -114,12 +115,12 @@ ahc_echo (void *cls,
          const char *version,
          const char *upload_data, size_t *upload_data_size, void **ptr)
 {
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void)ptr;               /* Unused. Silent compiler warning. */
+  (void) ptr;               /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
@@ -134,37 +135,39 @@ main (int argc, char *const *argv)
  unsigned int i;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  response = MHD_create_response_from_buffer (strlen (PAGE),
-                                              (void *) PAGE,
+                                              (void *) PAGE,
-                                              MHD_RESPMEM_PERSISTENT);
+                                              MHD_RESPMEM_PERSISTENT);
 #if 0
  (void) MHD_add_response_header (response,
-                                  MHD_HTTP_HEADER_CONNECTION,
+                                  MHD_HTTP_HEADER_CONNECTION,
-                                  "close");
+                                  "close");
 #endif
-  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_SUPPRESS_DATE_NO_CLOCK
+  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD
+                        | MHD_USE_SUPPRESS_DATE_NO_CLOCK
 #ifdef EPOLL_SUPPORT
-                        | MHD_USE_EPOLL | MHD_USE_TURBO
+                        | MHD_USE_EPOLL | MHD_USE_TURBO
 #endif
-                        ,
+                        ,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, NULL,
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
-                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
+                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned
-                        MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
+                                                      int) NUMBER_OF_THREADS,
-                        MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
+                        MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
-                        MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000,
+                        MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
-                        MHD_OPTION_END);
+                        MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000,
+                        MHD_OPTION_END);
  if (d == NULL)
    return 1;
  (void) getc (stdin);
  MHD_stop_daemon (d);
  MHD_destroy_response (response);
-  for (i=0;i<SMALL;i++)
+  for (i = 0; i<SMALL; i++)
    if (0 != small_deltas[i])
      fprintf (stdout, "D: %d %u\n", i, small_deltas[i]);
  return 0;
diff --git a/src/examples/benchmark_https.c b/src/examples/benchmark_https.c
index 64eb11b7..9506e562 100644
--- a/src/examples/benchmark_https.c
+++ b/src/examples/benchmark_https.c
@@ -25,14 +25,15 @@
 #include "platform.h"
 #include <microhttpd.h>
-#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2
+#if defined(CPU_COUNT) && (CPU_COUNT + 0) < 2
 #undef CPU_COUNT
 #endif
-#if !defined(CPU_COUNT)
+#if ! defined(CPU_COUNT)
 #define CPU_COUNT 2
 #endif
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 #define SMALL (1024 * 128)
@@ -62,16 +63,16 @@ static struct MHD_Response *response;
 */
 static void
 completed_callback (void *cls,
-                    struct MHD_Connection *connection,
+                    struct MHD_Connection *connection,
-                    void **con_cls,
+                    void **con_cls,
-                    enum MHD_RequestTerminationCode toe)
+                    enum MHD_RequestTerminationCode toe)
 {
  struct timeval *tv = *con_cls;
  struct timeval tve;
  uint64_t delta;
-  (void)cls;         /* Unused. Silent compiler warning. */
+  (void) cls;         /* Unused. Silent compiler warning. */
-  (void)connection;  /* Unused. Silent compiler warning. */
+  (void) connection;  /* Unused. Silent compiler warning. */
-  (void)toe;         /* Unused. Silent compiler warning. */
+  (void) toe;         /* Unused. Silent compiler warning. */
  if (NULL == tv)
    return;
@@ -80,10 +81,10 @@ completed_callback (void *cls,
  delta = 0;
  if (tve.tv_usec >= tv->tv_usec)
    delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
-      + (tve.tv_usec - tv->tv_usec);
+             + (tve.tv_usec - tv->tv_usec);
  else
    delta += (tve.tv_sec - tv->tv_sec) * 1000000LL
-      - tv->tv_usec + tve.tv_usec;
+             - tv->tv_usec + tve.tv_usec;
  if (delta < SMALL)
    small_deltas[delta]++;
  else
@@ -94,11 +95,11 @@ completed_callback (void *cls,
 static void *
 uri_logger_cb (void *cls,
-               const char *uri)
+               const char *uri)
 {
  struct timeval *tv = malloc (sizeof (struct timeval));
-  (void)cls; /* Unused. Silent compiler warning. */
+  (void) cls; /* Unused. Silent compiler warning. */
-  (void)uri; /* Unused. Silent compiler warning. */
+  (void) uri; /* Unused. Silent compiler warning. */
  if (NULL != tv)
    gettimeofday (tv, NULL);
@@ -114,12 +115,12 @@ ahc_echo (void *cls,
          const char *version,
          const char *upload_data, size_t *upload_data_size, void **ptr)
 {
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void)ptr;               /* Unused. Silent compiler warning. */
+  (void) ptr;               /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
@@ -129,53 +130,53 @@ ahc_echo (void *cls,
 /* test server key */
 const char srv_signed_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n"
-  "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n"
+                                  "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n"
-  "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n"
+                                  "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n"
-  "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n"
+                                  "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n"
-  "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n"
+                                  "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n"
-  "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n"
+                                  "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n"
-  "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n"
+                                  "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n"
-  "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n"
+                                  "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n"
-  "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n"
+                                  "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n"
-  "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n"
+                                  "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n"
-  "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n"
+                                  "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n"
-  "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n"
+                                  "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n"
-  "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n"
+                                  "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n"
-  "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n"
+                                  "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n"
-  "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n"
+                                  "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n"
-  "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n"
+                                  "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n"
-  "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n"
+                                  "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n"
-  "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n"
+                                  "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n"
-  "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n"
+                                  "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n"
-  "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n"
+                                  "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n"
-  "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n"
+                                  "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n"
-  "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n"
+                                  "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n"
-  "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n"
+                                  "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n"
-  "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n"
+                                  "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n"
-  "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n"
+                                  "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n"
-  "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n"
+                                  "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n"
-  "-----END RSA PRIVATE KEY-----\n";
+                                  "-----END RSA PRIVATE KEY-----\n";
 /* test server CA signed certificates */
 const char srv_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
-  "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
+                                   "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
-  "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
+                                   "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
-  "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
+                                   "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
-  "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n"
+                                   "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n"
-  "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n"
+                                   "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n"
-  "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n"
+                                   "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n"
-  "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n"
+                                   "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n"
-  "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n"
+                                   "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n"
-  "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
+                                   "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
-  "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n"
+                                   "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n"
-  "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n"
+                                   "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n"
-  "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n"
+                                   "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n"
-  "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n"
+                                   "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n"
-  "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n"
+                                   "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n"
-  "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n"
+                                   "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n"
-  "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n"
+                                   "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n"
-  "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n"
+                                   "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n"
-  "-----END CERTIFICATE-----\n";
+                                   "-----END CERTIFICATE-----\n";
 int
@@ -185,36 +186,37 @@ main (int argc, char *const *argv)
  unsigned int i;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  response = MHD_create_response_from_buffer (strlen (PAGE),
-                                              (void *) PAGE,
+                                              (void *) PAGE,
-                                              MHD_RESPMEM_PERSISTENT);
+                                              MHD_RESPMEM_PERSISTENT);
  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
 #ifdef EPOLL_SUPPORT
-                        | MHD_USE_EPOLL | MHD_USE_TURBO
+                        | MHD_USE_EPOLL | MHD_USE_TURBO
 #endif
-                        ,
+                        ,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, NULL,
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
-                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
+                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned
-                        MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
+                                                      int) NUMBER_OF_THREADS,
-                        MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
+                        MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
-                        MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000,
+                        MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
-                        /* Optionally, the gnutls_load_file() can be used to
+                        MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000,
-                           load the key and the certificate from file. */
+                        /* Optionally, the gnutls_load_file() can be used to
-                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
+                           load the key and the certificate from file. */
-                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
-                        MHD_OPTION_END);
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        MHD_OPTION_END);
  if (d == NULL)
    return 1;
  (void) getc (stdin);
  MHD_stop_daemon (d);
  MHD_destroy_response (response);
-  for (i=0;i<SMALL;i++)
+  for (i = 0; i<SMALL; i++)
    if (0 != small_deltas[i])
      fprintf (stdout, "D: %d %u\n", i, small_deltas[i]);
  return 0;
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c
index 26dacd3b..cd6539ef 100644
--- a/src/examples/chunked_example.c
+++ b/src/examples/chunked_example.c
@@ -40,15 +40,15 @@ callback (void *cls,
          size_t buf_size)
 {
  size_t size_to_copy;
-  struct ResponseContentCallbackParam * const param =
+  struct ResponseContentCallbackParam *const param =
-      (struct ResponseContentCallbackParam *)cls;
+    (struct ResponseContentCallbackParam *) cls;
  /* Note: 'pos' will never exceed size of transmitted data. */
  /* You can use 'pos == param->response_size' in next check. */
  if (pos >= param->response_size)
-    { /* Whole response was sent. Signal end of response. */
+  {   /* Whole response was sent. Signal end of response. */
-      return MHD_CONTENT_READER_END_OF_STREAM;
+    return MHD_CONTENT_READER_END_OF_STREAM;
-    }
+  }
  /* Pseudo code.        *
  if (data_not_ready)
@@ -82,12 +82,13 @@ callback (void *cls,
 static void
 free_callback_param (void *cls)
 {
-  free(cls);
+  free (cls);
 }
-static const char simple_response_text[] = "<html><head><title>Simple response</title></head>"
+static const char simple_response_text[] =
-                                           "<body>Simple response text</body></html>";
+  "<html><head><title>Simple response</title></head>"
+  "<body>Simple response text</body></html>";
 static int
@@ -104,27 +105,28 @@ ahc_echo (void *cls,
  struct ResponseContentCallbackParam *callback_param;
  struct MHD_Response *response;
  int ret;
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  callback_param = malloc (sizeof(struct ResponseContentCallbackParam));
  if (NULL == callback_param)
    return MHD_NO; /* Not enough memory. */
  callback_param->response_data = simple_response_text;
-  callback_param->response_size = (sizeof(simple_response_text)/sizeof(char)) - 1;
+  callback_param->response_size = (sizeof(simple_response_text)
+                                   / sizeof(char)) - 1;
  *ptr = NULL;                  /* reset when done */
  response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
@@ -150,28 +152,28 @@ main (int argc, char *const *argv)
  int port;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  port = atoi (argv[1]);
  if ( (1 > port) ||
       (port > UINT16_MAX) )
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "Port must be a number between 1 and 65535\n");
+             "Port must be a number between 1 and 65535\n");
-      return 1;
+    return 1;
-    }
+  }
  d = MHD_start_daemon (/* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
-                        MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+    MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
-                        /* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, */
+    /* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, */
-                        /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, */
+    /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, */
-                        /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
+    /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
-                        (uint16_t) port,
+    (uint16_t) port,
-                        NULL, NULL,
+    NULL, NULL,
-                        &ahc_echo, NULL,
+    &ahc_echo, NULL,
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+    MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
-                        MHD_OPTION_END);
+    MHD_OPTION_END);
  if (NULL == d)
    return 1;
  (void) getc (stdin);
diff --git a/src/examples/connection_close.c b/src/examples/connection_close.c
index 88222cbf..43ee379f 100644
--- a/src/examples/connection_close.c
+++ b/src/examples/connection_close.c
@@ -25,7 +25,8 @@
 #include "platform.h"
 #include <microhttpd.h>
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 static int
 ahc_echo (void *cls,
@@ -39,23 +40,23 @@ ahc_echo (void *cls,
  const char *me = cls;
  struct MHD_Response *response;
  int ret;
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  *ptr = NULL;                  /* reset when done */
  response = MHD_create_response_from_buffer (strlen (me),
-                                              (void *) me,
+                                              (void *) me,
-                                              MHD_RESPMEM_PERSISTENT);
+                                              MHD_RESPMEM_PERSISTENT);
  ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
  MHD_destroy_response (response);
  return ret;
@@ -65,27 +66,27 @@ ahc_echo (void *cls,
 static void
 request_completed (void *cls,
-                   struct MHD_Connection *connection,
+                   struct MHD_Connection *connection,
-                   void **con_cls,
+                   void **con_cls,
-                   enum MHD_RequestTerminationCode toe)
+                   enum MHD_RequestTerminationCode toe)
 {
  fprintf (stderr,
-           "%llu - RC: %d\n",
+           "%llu - RC: %d\n",
-           (unsigned long long) __rdtsc(),
+           (unsigned long long) __rdtsc (),
-           toe);
+           toe);
 }
 static void
 connection_completed (void *cls,
-                      struct MHD_Connection *connection,
+                      struct MHD_Connection *connection,
-                      void **socket_context,
+                      void **socket_context,
-                      enum MHD_ConnectionNotificationCode toe)
+                      enum MHD_ConnectionNotificationCode toe)
 {
  fprintf (stderr,
-           "%llu - CC: %d\n",
+           "%llu - CC: %d\n",
-           (unsigned long long) __rdtsc(),
+           (unsigned long long) __rdtsc (),
-           toe);
+           toe);
 }
@@ -95,22 +96,23 @@ main (int argc, char *const *argv)
  struct MHD_Daemon *d;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  d = MHD_start_daemon (/* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
                        /* MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
                        /* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, */
-                        MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL, // | MHD_USE_ITC, 
+    MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD
-                        /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
+    | MHD_USE_ERROR_LOG | MHD_USE_POLL,                                                                   // | MHD_USE_ITC,
-                        atoi (argv[1]),
+    /* MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
-                        NULL, NULL, &ahc_echo, PAGE,
+    atoi (argv[1]),
-                        MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL,
+    NULL, NULL, &ahc_echo, PAGE,
-                        MHD_OPTION_NOTIFY_CONNECTION, &connection_completed, NULL,
+    MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL,
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+    MHD_OPTION_NOTIFY_CONNECTION, &connection_completed, NULL,
-                        MHD_OPTION_STRICT_FOR_CLIENT, (int) 1,
+    MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
-                        MHD_OPTION_END);
+    MHD_OPTION_STRICT_FOR_CLIENT, (int) 1,
+    MHD_OPTION_END);
  if (d == NULL)
    return 1;
  (void) getc (stdin);
diff --git a/src/examples/demo.c b/src/examples/demo.c
index e93fb34b..375f2a63 100644
--- a/src/examples/demo.c
+++ b/src/examples/demo.c
@@ -41,10 +41,10 @@
 #include <limits.h>
 #include <ctype.h>
-#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2
+#if defined(CPU_COUNT) && (CPU_COUNT + 0) < 2
 #undef CPU_COUNT
 #endif
-#if !defined(CPU_COUNT)
+#if ! defined(CPU_COUNT)
 #define CPU_COUNT 2
 #endif
@@ -73,46 +73,50 @@
 /**
 * Page returned for file-not-found.
 */
-#define FILE_NOT_FOUND_PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define FILE_NOT_FOUND_PAGE \
+  "<html><head><title>File not found</title></head><body>File not found</body></html>"
 /**
 * Page returned for internal errors.
 */
-#define INTERNAL_ERROR_PAGE "<html><head><title>Internal error</title></head><body>Internal error</body></html>"
+#define INTERNAL_ERROR_PAGE \
+  "<html><head><title>Internal error</title></head><body>Internal error</body></html>"
 /**
 * Page returned for refused requests.
 */
-#define REQUEST_REFUSED_PAGE "<html><head><title>Request refused</title></head><body>Request refused (file exists?)</body></html>"
+#define REQUEST_REFUSED_PAGE \
+  "<html><head><title>Request refused</title></head><body>Request refused (file exists?)</body></html>"
 /**
 * Head of index page.
 */
-#define INDEX_PAGE_HEADER "<html>\n<head><title>Welcome</title></head>\n<body>\n"\
+#define INDEX_PAGE_HEADER \
-   "<h1>Upload</h1>\n"\
+  "<html>\n<head><title>Welcome</title></head>\n<body>\n" \
-   "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"/\">\n"\
+  "<h1>Upload</h1>\n" \
-   "<dl><dt>Content type:</dt><dd>"\
+  "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"/\">\n" \
-   "<input type=\"radio\" name=\"category\" value=\"books\">Book</input>"\
+  "<dl><dt>Content type:</dt><dd>" \
-   "<input type=\"radio\" name=\"category\" value=\"images\">Image</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"books\">Book</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"music\">Music</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"images\">Image</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"software\">Software</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"music\">Music</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"videos\">Videos</input>\n"\
+  "<input type=\"radio\" name=\"category\" value=\"software\">Software</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"other\" checked>Other</input></dd>"\
+  "<input type=\"radio\" name=\"category\" value=\"videos\">Videos</input>\n" \
-   "<dt>Language:</dt><dd>"\
+  "<input type=\"radio\" name=\"category\" value=\"other\" checked>Other</input></dd>" \
-   "<input type=\"radio\" name=\"language\" value=\"no-lang\" checked>none</input>"\
+  "<dt>Language:</dt><dd>" \
-   "<input type=\"radio\" name=\"language\" value=\"en\">English</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"no-lang\" checked>none</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"de\">German</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"en\">English</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"fr\">French</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"de\">German</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"es\">Spanish</input></dd>\n"\
+  "<input type=\"radio\" name=\"language\" value=\"fr\">French</input>" \
-   "<dt>File:</dt><dd>"\
+  "<input type=\"radio\" name=\"language\" value=\"es\">Spanish</input></dd>\n" \
-   "<input type=\"file\" name=\"upload\"/></dd></dl>"\
+  "<dt>File:</dt><dd>" \
-   "<input type=\"submit\" value=\"Send!\"/>\n"\
+  "<input type=\"file\" name=\"upload\"/></dd></dl>" \
-   "</form>\n"\
+  "<input type=\"submit\" value=\"Send!\"/>\n" \
-   "<h1>Download</h1>\n"\
+  "</form>\n" \
-   "<ol>\n"
+  "<h1>Download</h1>\n" \
+  "<ol>\n"
 /**
 * Footer of index page.
@@ -124,16 +128,15 @@
 * NULL-terminated array of supported upload categories.  Should match HTML
 * in the form.
 */
-static const char * const categories[] =
+static const char *const categories[] = {
-  {
+  "books",
-    "books",
+  "images",
-    "images",
+  "music",
-    "music",
+  "software",
-    "software",
+  "videos",
-    "videos",
+  "other",
-    "other",
+  NULL,
-    NULL,
+};
-  };
 /**
@@ -157,15 +160,14 @@ struct Language
 * NULL-terminated array of supported upload categories.  Should match HTML
 * in the form.
 */
-static const struct Language languages[] =
+static const struct Language languages[] = {
-  {
+  { "no-lang", "No language specified" },
-    { "no-lang", "No language specified" },
+  { "en", "English" },
-    { "en", "English" },
+  { "de", "German" },
-    { "de", "German" },
+  { "fr", "French" },
-    { "fr", "French" },
+  { "es", "Spanish" },
-    { "es", "Spanish" },
+  { NULL, NULL },
-    { NULL, NULL },
+};
-  };
 /**
@@ -210,8 +212,8 @@ static void
 mark_as_html (struct MHD_Response *response)
 {
  (void) MHD_add_response_header (response,
-                                  MHD_HTTP_HEADER_CONTENT_TYPE,
+                                  MHD_HTTP_HEADER_CONTENT_TYPE,
-                                  "text/html");
+                                  "text/html");
 }
@@ -264,7 +266,7 @@ struct ResponseDataContext
 */
 static int
 list_directory (struct ResponseDataContext *rdc,
-                const char *dirname)
+                const char *dirname)
 {
  char fullname[PATH_MAX];
  struct stat sbuf;
@@ -274,35 +276,35 @@ list_directory (struct ResponseDataContext *rdc,
  if (NULL == (dir = opendir (dirname)))
    return MHD_NO;
  while (NULL != (de = readdir (dir)))
+  {
+    if ('.' == de->d_name[0])
+      continue;
+    if (sizeof (fullname) <= (unsigned int)
+        snprintf (fullname, sizeof (fullname),
+                  "%s/%s",
+                  dirname, de->d_name))
+      continue; /* ugh, file too long? how can this be!? */
+    if (0 != stat (fullname, &sbuf))
+      continue; /* ugh, failed to 'stat' */
+    if (! S_ISREG (sbuf.st_mode))
+      continue; /* not a regular file, skip */
+    if (rdc->off + 1024 > rdc->buf_len)
    {
-      if ('.' == de->d_name[0])
+      void *r;
-        continue;
-      if (sizeof (fullname) <= (unsigned int)
+      if ( (2 * rdc->buf_len + 1024) < rdc->buf_len)
-          snprintf (fullname, sizeof (fullname),
+        break; /* more than SIZE_T _index_ size? Too big for us */
-                    "%s/%s",
+      rdc->buf_len = 2 * rdc->buf_len + 1024;
-                    dirname, de->d_name))
+      if (NULL == (r = realloc (rdc->buf, rdc->buf_len)))
-        continue; /* ugh, file too long? how can this be!? */
+        break; /* out of memory */
-      if (0 != stat (fullname, &sbuf))
+      rdc->buf = r;
-        continue; /* ugh, failed to 'stat' */
-      if (! S_ISREG (sbuf.st_mode))
-        continue; /* not a regular file, skip */
-      if (rdc->off + 1024 > rdc->buf_len)
-        {
-          void *r;
-          if ( (2 * rdc->buf_len + 1024) < rdc->buf_len)
-            break; /* more than SIZE_T _index_ size? Too big for us */
-          rdc->buf_len = 2 * rdc->buf_len + 1024;
-          if (NULL == (r = realloc (rdc->buf, rdc->buf_len)))
-            break; /* out of memory */
-          rdc->buf = r;
-        }
-      rdc->off += snprintf (&rdc->buf[rdc->off],
-                            rdc->buf_len - rdc->off,
-                            "<li><a href=\"/%s\">%s</a></li>\n",
-                            fullname,
-                            de->d_name);
    }
+    rdc->off += snprintf (&rdc->buf[rdc->off],
+                          rdc->buf_len - rdc->off,
+                          "<li><a href=\"/%s\">%s</a></li>\n",
+                          fullname,
+                          de->d_name);
+  }
  (void) closedir (dir);
  return MHD_YES;
 }
@@ -326,65 +328,66 @@ update_directory ()
  rdc.buf_len = initial_allocation;
  if (NULL == (rdc.buf = malloc (rdc.buf_len)))
-    {
+  {
-      update_cached_response (NULL);
+    update_cached_response (NULL);
-      return;
+    return;
-    }
+  }
  rdc.off = snprintf (rdc.buf, rdc.buf_len,
-                      "%s",
+                      "%s",
-                      INDEX_PAGE_HEADER);
+                      INDEX_PAGE_HEADER);
-  for (language_idx = 0; NULL != languages[language_idx].dirname; language_idx++)
+  for (language_idx = 0; NULL != languages[language_idx].dirname;
+       language_idx++)
+  {
+    language = &languages[language_idx];
+    if (0 != stat (language->dirname, &sbuf))
+      continue; /* empty */
+    /* we ensured always +1k room, filenames are ~256 bytes,
+ so there is always still enough space for the header
+ without need for an additional reallocation check. */
+    rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
+                         "<h2>%s</h2>\n",
+                         language->longname);
+    for (category_idx = 0; NULL != categories[category_idx]; category_idx++)
    {
-      language = &languages[language_idx];
+      category = categories[category_idx];
+      snprintf (dir_name, sizeof (dir_name),
+                "%s/%s",
+                language->dirname,
+                category);
+      if (0 != stat (dir_name, &sbuf))
+        continue; /* empty */
-      if (0 != stat (language->dirname, &sbuf))
-        continue; /* empty */
      /* we ensured always +1k room, filenames are ~256 bytes,
-         so there is always still enough space for the header
+         so there is always still enough space for the header
-         without need for an additional reallocation check. */
+         without need for an additional reallocation check. */
      rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                           "<h2>%s</h2>\n",
+                           "<h3>%s</h3>\n",
-                           language->longname);
+                           category);
-      for (category_idx = 0; NULL != categories[category_idx]; category_idx++)
-        {
+      if (MHD_NO == list_directory (&rdc, dir_name))
-          category = categories[category_idx];
+      {
-          snprintf (dir_name, sizeof (dir_name),
+        free (rdc.buf);
-                    "%s/%s",
+        update_cached_response (NULL);
-                    language->dirname,
+        return;
-                    category);
+      }
-          if (0 != stat (dir_name, &sbuf))
-            continue; /* empty */
-          /* we ensured always +1k room, filenames are ~256 bytes,
-             so there is always still enough space for the header
-             without need for an additional reallocation check. */
-          rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                               "<h3>%s</h3>\n",
-                               category);
-          if (MHD_NO == list_directory (&rdc, dir_name))
-            {
-              free (rdc.buf);
-              update_cached_response (NULL);
-              return;
-            }
-        }
    }
+  }
  /* we ensured always +1k room, filenames are ~256 bytes,
     so there is always still enough space for the footer
     without need for a final reallocation check. */
  rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                       "%s",
+                       "%s",
-                       INDEX_PAGE_FOOTER);
+                       INDEX_PAGE_FOOTER);
  initial_allocation = rdc.buf_len; /* remember for next time */
  response = MHD_create_response_from_buffer (rdc.off,
-                                              rdc.buf,
+                                              rdc.buf,
-                                              MHD_RESPMEM_MUST_FREE);
+                                              MHD_RESPMEM_MUST_FREE);
  mark_as_html (response);
 #if FORCE_CLOSE
  (void) MHD_add_response_header (response,
-                                  MHD_HTTP_HEADER_CONNECTION,
+                                  MHD_HTTP_HEADER_CONNECTION,
-                                  "close");
+                                  "close");
 #endif
  update_cached_response (response);
 }
@@ -443,8 +446,8 @@ struct UploadContext
 */
 static int
 do_append (char **ret,
-           const char *data,
+           const char *data,
-           size_t size)
+           size_t size)
 {
  char *buf;
  size_t old_len;
@@ -456,15 +459,15 @@ do_append (char **ret,
  if (NULL == (buf = malloc (old_len + size + 1)))
    return MHD_NO;
  if (NULL != *ret)
-    {
+  {
-      memcpy (buf,
+    memcpy (buf,
-              *ret,
+            *ret,
-              old_len);
+            old_len);
-      free (*ret);
+    free (*ret);
-    }
+  }
  memcpy (&buf[old_len],
-          data,
+          data,
-          size);
+          size);
  buf[old_len + size] = '\0';
  *ret = buf;
  return MHD_YES;
@@ -492,119 +495,119 @@ do_append (char **ret,
 */
 static int
 process_upload_data (void *cls,
-                     enum MHD_ValueKind kind,
+                     enum MHD_ValueKind kind,
-                     const char *key,
+                     const char *key,
-                     const char *filename,
+                     const char *filename,
-                     const char *content_type,
+                     const char *content_type,
-                     const char *transfer_encoding,
+                     const char *transfer_encoding,
-                     const char *data,
+                     const char *data,
-                     uint64_t off,
+                     uint64_t off,
-                     size_t size)
+                     size_t size)
 {
  struct UploadContext *uc = cls;
  int i;
-  (void)kind;              /* Unused. Silent compiler warning. */
+  (void) kind;              /* Unused. Silent compiler warning. */
-  (void)content_type;      /* Unused. Silent compiler warning. */
+  (void) content_type;      /* Unused. Silent compiler warning. */
-  (void)transfer_encoding; /* Unused. Silent compiler warning. */
+  (void) transfer_encoding; /* Unused. Silent compiler warning. */
-  (void)off;               /* Unused. Silent compiler warning. */
+  (void) off;               /* Unused. Silent compiler warning. */
  if (0 == strcmp (key, "category"))
    return do_append (&uc->category, data, size);
  if (0 == strcmp (key, "language"))
    return do_append (&uc->language, data, size);
  if (0 != strcmp (key, "upload"))
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "Ignoring unexpected form value `%s'\n",
+             "Ignoring unexpected form value `%s'\n",
-               key);
+             key);
-      return MHD_YES; /* ignore */
+    return MHD_YES;   /* ignore */
-    }
+  }
  if (NULL == filename)
-    {
+  {
-      fprintf (stderr, "No filename, aborting upload\n");
+    fprintf (stderr, "No filename, aborting upload\n");
-      return MHD_NO; /* no filename, error */
+    return MHD_NO;   /* no filename, error */
-    }
+  }
  if ( (NULL == uc->category) ||
       (NULL == uc->language) )
+  {
+    fprintf (stderr,
+             "Missing form data for upload `%s'\n",
+             filename);
+    uc->response = request_refused_response;
+    return MHD_NO;
+  }
+  if (-1 == uc->fd)
+  {
+    char fn[PATH_MAX];
+    if ( (NULL != strstr (filename, "..")) ||
+         (NULL != strchr (filename, '/')) ||
+         (NULL != strchr (filename, '\\')) )
    {
-      fprintf (stderr,
-               "Missing form data for upload `%s'\n",
-               filename);
      uc->response = request_refused_response;
      return MHD_NO;
    }
-  if (-1 == uc->fd)
+    /* create directories -- if they don't exist already */
-    {
-      char fn[PATH_MAX];
-      if ( (NULL != strstr (filename, "..")) ||
-           (NULL != strchr (filename, '/')) ||
-           (NULL != strchr (filename, '\\')) )
-        {
-          uc->response = request_refused_response;
-          return MHD_NO;
-        }
-      /* create directories -- if they don't exist already */
 #ifdef WINDOWS
-      (void) mkdir (uc->language);
+    (void) mkdir (uc->language);
 #else
-      (void) mkdir (uc->language, S_IRWXU);
+    (void) mkdir (uc->language, S_IRWXU);
 #endif
-      snprintf (fn, sizeof (fn),
+    snprintf (fn, sizeof (fn),
-                "%s/%s",
+              "%s/%s",
-                uc->language,
+              uc->language,
-                uc->category);
+              uc->category);
 #ifdef WINDOWS
-      (void) mkdir (fn);
+    (void) mkdir (fn);
 #else
-      (void) mkdir (fn, S_IRWXU);
+    (void) mkdir (fn, S_IRWXU);
 #endif
-      /* open file */
+    /* open file */
-      snprintf (fn, sizeof (fn),
+    snprintf (fn, sizeof (fn),
-                "%s/%s/%s",
+              "%s/%s/%s",
-                uc->language,
+              uc->language,
-                uc->category,
+              uc->category,
-                filename);
+              filename);
-      for (i=strlen (fn)-1;i>=0;i--)
+    for (i = strlen (fn) - 1; i>=0; i--)
-        if (! isprint ((unsigned char) fn[i]))
+      if (! isprint ((unsigned char) fn[i]))
-          fn[i] = '_';
+        fn[i] = '_';
-      uc->fd = open (fn,
+    uc->fd = open (fn,
-                     O_CREAT | O_EXCL
+                   O_CREAT | O_EXCL
 #if O_LARGEFILE
-                     | O_LARGEFILE
+                   | O_LARGEFILE
 #endif
-                     | O_WRONLY,
+                   | O_WRONLY,
-                     S_IRUSR | S_IWUSR);
+                   S_IRUSR | S_IWUSR);
-      if (-1 == uc->fd)
+    if (-1 == uc->fd)
-        {
+    {
-          fprintf (stderr,
+      fprintf (stderr,
-                   "Error opening file `%s' for upload: %s\n",
+               "Error opening file `%s' for upload: %s\n",
-                   fn,
+               fn,
-                   strerror (errno));
+               strerror (errno));
-          uc->response = request_refused_response;
+      uc->response = request_refused_response;
-          return MHD_NO;
+      return MHD_NO;
-        }
-      uc->filename = strdup (fn);
    }
+    uc->filename = strdup (fn);
+  }
  if ( (0 != size) &&
       (size != (size_t) write (uc->fd, data, size)) )
+  {
+    /* write failed; likely: disk full */
+    fprintf (stderr,
+             "Error writing to file `%s': %s\n",
+             uc->filename,
+             strerror (errno));
+    uc->response = internal_error_response;
+    (void) close (uc->fd);
+    uc->fd = -1;
+    if (NULL != uc->filename)
    {
-      /* write failed; likely: disk full */
+      unlink (uc->filename);
-      fprintf (stderr,
+      free (uc->filename);
-               "Error writing to file `%s': %s\n",
+      uc->filename = NULL;
-               uc->filename,
-               strerror (errno));
-      uc->response = internal_error_response;
-      (void) close (uc->fd);
-      uc->fd = -1;
-      if (NULL != uc->filename)
-        {
-          unlink (uc->filename);
-          free (uc->filename);
-          uc->filename = NULL;
-        }
-      return MHD_NO;
    }
+    return MHD_NO;
+  }
  return MHD_YES;
 }
@@ -622,32 +625,32 @@ process_upload_data (void *cls,
 */
 static void
 response_completed_callback (void *cls,
-                             struct MHD_Connection *connection,
+                             struct MHD_Connection *connection,
-                             void **con_cls,
+                             void **con_cls,
-                             enum MHD_RequestTerminationCode toe)
+                             enum MHD_RequestTerminationCode toe)
 {
  struct UploadContext *uc = *con_cls;
-  (void)cls;         /* Unused. Silent compiler warning. */
+  (void) cls;         /* Unused. Silent compiler warning. */
-  (void)connection;  /* Unused. Silent compiler warning. */
+  (void) connection;  /* Unused. Silent compiler warning. */
-  (void)toe;         /* Unused. Silent compiler warning. */
+  (void) toe;         /* Unused. Silent compiler warning. */
  if (NULL == uc)
    return; /* this request wasn't an upload request */
  if (NULL != uc->pp)
-    {
+  {
-      MHD_destroy_post_processor (uc->pp);
+    MHD_destroy_post_processor (uc->pp);
-      uc->pp = NULL;
+    uc->pp = NULL;
-    }
+  }
  if (-1 != uc->fd)
  {
    (void) close (uc->fd);
    if (NULL != uc->filename)
-      {
+    {
-        fprintf (stderr,
+      fprintf (stderr,
-                 "Upload of file `%s' failed (incomplete or aborted), removing file.\n",
+               "Upload of file `%s' failed (incomplete or aborted), removing file.\n",
-                 uc->filename);
+               uc->filename);
-        (void) unlink (uc->filename);
+      (void) unlink (uc->filename);
-      }
+    }
  }
  if (NULL != uc->filename)
    free (uc->filename);
@@ -669,12 +672,12 @@ return_directory_response (struct MHD_Connection *connection)
  (void) pthread_mutex_lock (&mutex);
  if (NULL == cached_directory_response)
    ret = MHD_queue_response (connection,
-                              MHD_HTTP_INTERNAL_SERVER_ERROR,
+                              MHD_HTTP_INTERNAL_SERVER_ERROR,
-                              internal_error_response);
+                              internal_error_response);
  else
    ret = MHD_queue_response (connection,
-                              MHD_HTTP_OK,
+                              MHD_HTTP_OK,
-                              cached_directory_response);
+                              cached_directory_response);
  (void) pthread_mutex_unlock (&mutex);
  return ret;
 }
@@ -695,12 +698,12 @@ return_directory_response (struct MHD_Connection *connection)
 */
 static int
 generate_page (void *cls,
-               struct MHD_Connection *connection,
+               struct MHD_Connection *connection,
-               const char *url,
+               const char *url,
-               const char *method,
+               const char *method,
-               const char *version,
+               const char *version,
-               const char *upload_data,
+               const char *upload_data,
-               size_t *upload_data_size, void **ptr)
+               size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
  int ret;
@@ -710,117 +713,117 @@ generate_page (void *cls,
  (void) version;           /* Unused. Silent compiler warning. */
  if (0 != strcmp (url, "/"))
-    {
+  {
-      /* should be file download */
+    /* should be file download */
 #ifdef MHD_HAVE_LIBMAGIC
-      char file_data[MAGIC_HEADER_SIZE];
+    char file_data[MAGIC_HEADER_SIZE];
-      ssize_t got;
+    ssize_t got;
 #endif /* MHD_HAVE_LIBMAGIC */
-      const char *mime;
+    const char *mime;
-      if ( (0 != strcmp (method, MHD_HTTP_METHOD_GET)) &&
+    if ( (0 != strcmp (method, MHD_HTTP_METHOD_GET)) &&
-           (0 != strcmp (method, MHD_HTTP_METHOD_HEAD)) )
+         (0 != strcmp (method, MHD_HTTP_METHOD_HEAD)) )
-        return MHD_NO;  /* unexpected method (we're not polite...) */
+      return MHD_NO;    /* unexpected method (we're not polite...) */
-      fd = -1;
+    fd = -1;
-      if ( (NULL == strstr (&url[1], "..")) &&
+    if ( (NULL == strstr (&url[1], "..")) &&
-           ('/' != url[1]) )
+         ('/' != url[1]) )
-        {
+    {
-          fd = open (&url[1], O_RDONLY);
+      fd = open (&url[1], O_RDONLY);
-          if ( (-1 != fd) &&
+      if ( (-1 != fd) &&
-               ( (0 != fstat (fd, &buf)) ||
+           ( (0 != fstat (fd, &buf)) ||
-                 (! S_ISREG (buf.st_mode)) ) )
+             (! S_ISREG (buf.st_mode)) ) )
-            {
+      {
-              (void) close (fd);
+        (void) close (fd);
-              fd = -1;
+        fd = -1;
-            }
+      }
-        }
+    }
-      if (-1 == fd)
+    if (-1 == fd)
-        return MHD_queue_response (connection,
+      return MHD_queue_response (connection,
-                                   MHD_HTTP_NOT_FOUND,
+                                 MHD_HTTP_NOT_FOUND,
-                                   file_not_found_response);
+                                 file_not_found_response);
 #ifdef MHD_HAVE_LIBMAGIC
-      /* read beginning of the file to determine mime type  */
+    /* read beginning of the file to determine mime type  */
-      got = read (fd, file_data, sizeof (file_data));
+    got = read (fd, file_data, sizeof (file_data));
-      (void) lseek (fd, 0, SEEK_SET);
+    (void) lseek (fd, 0, SEEK_SET);
-      if (-1 != got)
+    if (-1 != got)
-        mime = magic_buffer (magic, file_data, got);
+      mime = magic_buffer (magic, file_data, got);
-      else
+    else
 #endif /* MHD_HAVE_LIBMAGIC */
-        mime = NULL;
+    mime = NULL;
-      if (NULL == (response = MHD_create_response_from_fd (buf.st_size,
+    if (NULL == (response = MHD_create_response_from_fd (buf.st_size,
-                                                           fd)))
+                                                         fd)))
-        {
+    {
-          /* internal error (i.e. out of memory) */
+      /* internal error (i.e. out of memory) */
-          (void) close (fd);
+      (void) close (fd);
-          return MHD_NO;
+      return MHD_NO;
-        }
-      /* add mime type if we had one */
-      if (NULL != mime)
-        (void) MHD_add_response_header (response,
-                                        MHD_HTTP_HEADER_CONTENT_TYPE,
-                                        mime);
-      ret = MHD_queue_response (connection,
-                                MHD_HTTP_OK,
-                                response);
-      MHD_destroy_response (response);
-      return ret;
    }
+    /* add mime type if we had one */
+    if (NULL != mime)
+      (void) MHD_add_response_header (response,
+                                      MHD_HTTP_HEADER_CONTENT_TYPE,
+                                      mime);
+    ret = MHD_queue_response (connection,
+                              MHD_HTTP_OK,
+                              response);
+    MHD_destroy_response (response);
+    return ret;
+  }
  if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
+  {
+    /* upload! */
+    struct UploadContext *uc = *ptr;
+    if (NULL == uc)
+    {
+      if (NULL == (uc = malloc (sizeof (struct UploadContext))))
+        return MHD_NO; /* out of memory, close connection */
+      memset (uc, 0, sizeof (struct UploadContext));
+      uc->fd = -1;
+      uc->connection = connection;
+      uc->pp = MHD_create_post_processor (connection,
+                                          64 * 1024 /* buffer size */,
+                                          &process_upload_data, uc);
+      if (NULL == uc->pp)
+      {
+        /* out of memory, close connection */
+        free (uc);
+        return MHD_NO;
+      }
+      *ptr = uc;
+      return MHD_YES;
+    }
+    if (0 != *upload_data_size)
+    {
+      if (NULL == uc->response)
+        (void) MHD_post_process (uc->pp,
+                                 upload_data,
+                                 *upload_data_size);
+      *upload_data_size = 0;
+      return MHD_YES;
+    }
+    /* end of upload, finish it! */
+    MHD_destroy_post_processor (uc->pp);
+    uc->pp = NULL;
+    if (-1 != uc->fd)
+    {
+      close (uc->fd);
+      uc->fd = -1;
+    }
+    if (NULL != uc->response)
+    {
+      return MHD_queue_response (connection,
+                                 MHD_HTTP_FORBIDDEN,
+                                 uc->response);
+    }
+    else
    {
-      /* upload! */
+      update_directory ();
-      struct UploadContext *uc = *ptr;
+      return return_directory_response (connection);
-      if (NULL == uc)
-        {
-          if (NULL == (uc = malloc (sizeof (struct UploadContext))))
-            return MHD_NO; /* out of memory, close connection */
-          memset (uc, 0, sizeof (struct UploadContext));
-          uc->fd = -1;
-          uc->connection = connection;
-          uc->pp = MHD_create_post_processor (connection,
-                                              64 * 1024 /* buffer size */,
-                                              &process_upload_data, uc);
-          if (NULL == uc->pp)
-            {
-              /* out of memory, close connection */
-              free (uc);
-              return MHD_NO;
-            }
-          *ptr = uc;
-          return MHD_YES;
-        }
-      if (0 != *upload_data_size)
-        {
-          if (NULL == uc->response)
-            (void) MHD_post_process (uc->pp,
-                                     upload_data,
-                                     *upload_data_size);
-          *upload_data_size = 0;
-          return MHD_YES;
-        }
-      /* end of upload, finish it! */
-      MHD_destroy_post_processor (uc->pp);
-      uc->pp = NULL;
-      if (-1 != uc->fd)
-        {
-          close (uc->fd);
-          uc->fd = -1;
-        }
-      if (NULL != uc->response)
-        {
-          return MHD_queue_response (connection,
-                                     MHD_HTTP_FORBIDDEN,
-                                     uc->response);
-        }
-      else
-        {
-          update_directory ();
-          return return_directory_response (connection);
-        }
    }
+  }
  if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) ||
       (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) )
  {
@@ -829,8 +832,8 @@ generate_page (void *cls,
  /* unexpected request, refuse */
  return MHD_queue_response (connection,
-                             MHD_HTTP_FORBIDDEN,
+                             MHD_HTTP_FORBIDDEN,
-                             request_refused_response);
+                             request_refused_response);
 }
@@ -843,7 +846,7 @@ generate_page (void *cls,
 static void
 catcher (int sig)
 {
-  (void)sig;    /* Unused. Silent compiler warning. */
+  (void) sig;  /* Unused. Silent compiler warning. */
  /* do nothing */
 }
@@ -889,11 +892,11 @@ main (int argc, char *const *argv)
  if ( (argc != 2) ||
       (1 != sscanf (argv[1], "%u", &port)) ||
       (UINT16_MAX < port) )
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "%s PORT\n", argv[0]);
+             "%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
 #ifndef MINGW
  ignore_sigpipe ();
 #endif
@@ -903,31 +906,42 @@ main (int argc, char *const *argv)
 #endif /* MHD_HAVE_LIBMAGIC */
  (void) pthread_mutex_init (&mutex, NULL);
-  file_not_found_response = MHD_create_response_from_buffer (strlen (FILE_NOT_FOUND_PAGE),
+  file_not_found_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) FILE_NOT_FOUND_PAGE,
+                                                               FILE_NOT_FOUND_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                             (void *)
+                                                             FILE_NOT_FOUND_PAGE,
+                                                             MHD_RESPMEM_PERSISTENT);
  mark_as_html (file_not_found_response);
-  request_refused_response = MHD_create_response_from_buffer (strlen (REQUEST_REFUSED_PAGE),
+  request_refused_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) REQUEST_REFUSED_PAGE,
+                                                                REQUEST_REFUSED_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                              (void *)
+                                                              REQUEST_REFUSED_PAGE,
+                                                              MHD_RESPMEM_PERSISTENT);
  mark_as_html (request_refused_response);
-  internal_error_response = MHD_create_response_from_buffer (strlen (INTERNAL_ERROR_PAGE),
+  internal_error_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) INTERNAL_ERROR_PAGE,
+                                                               INTERNAL_ERROR_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                             (void *)
+                                                             INTERNAL_ERROR_PAGE,
+                                                             MHD_RESPMEM_PERSISTENT);
  mark_as_html (internal_error_response);
  update_directory ();
-  d = MHD_start_daemon (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+  d = MHD_start_daemon (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD
+                        | MHD_USE_ERROR_LOG,
                        port,
                        NULL, NULL,
-                        &generate_page, NULL,
+                        &generate_page, NULL,
-                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024),
+                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256
+                                                                      * 1024),
 #if PRODUCTION
-                        MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64),
+                        MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64),
 #endif
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */),
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned
-                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
+                                                        int) (120 /* seconds */),
-                        MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL,
+                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned
-                        MHD_OPTION_END);
+                                                      int) NUMBER_OF_THREADS,
+                        MHD_OPTION_NOTIFY_COMPLETED,
+                        &response_completed_callback, NULL,
+                        MHD_OPTION_END);
  if (NULL == d)
    return 1;
  fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n");
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index f2230b16..7f7eb3a5 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -44,10 +44,10 @@
 #include <limits.h>
 #include <ctype.h>
-#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2
+#if defined(CPU_COUNT) && (CPU_COUNT + 0) < 2
 #undef CPU_COUNT
 #endif
-#if !defined(CPU_COUNT)
+#if ! defined(CPU_COUNT)
 #define CPU_COUNT 2
 #endif
@@ -76,46 +76,50 @@
 /**
 * Page returned for file-not-found.
 */
-#define FILE_NOT_FOUND_PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define FILE_NOT_FOUND_PAGE \
+  "<html><head><title>File not found</title></head><body>File not found</body></html>"
 /**
 * Page returned for internal errors.
 */
-#define INTERNAL_ERROR_PAGE "<html><head><title>Internal error</title></head><body>Internal error</body></html>"
+#define INTERNAL_ERROR_PAGE \
+  "<html><head><title>Internal error</title></head><body>Internal error</body></html>"
 /**
 * Page returned for refused requests.
 */
-#define REQUEST_REFUSED_PAGE "<html><head><title>Request refused</title></head><body>Request refused (file exists?)</body></html>"
+#define REQUEST_REFUSED_PAGE \
+  "<html><head><title>Request refused</title></head><body>Request refused (file exists?)</body></html>"
 /**
 * Head of index page.
 */
-#define INDEX_PAGE_HEADER "<html>\n<head><title>Welcome</title></head>\n<body>\n"\
+#define INDEX_PAGE_HEADER \
-   "<h1>Upload</h1>\n"\
+  "<html>\n<head><title>Welcome</title></head>\n<body>\n" \
-   "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"/\">\n"\
+  "<h1>Upload</h1>\n" \
-   "<dl><dt>Content type:</dt><dd>"\
+  "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"/\">\n" \
-   "<input type=\"radio\" name=\"category\" value=\"books\">Book</input>"\
+  "<dl><dt>Content type:</dt><dd>" \
-   "<input type=\"radio\" name=\"category\" value=\"images\">Image</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"books\">Book</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"music\">Music</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"images\">Image</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"software\">Software</input>"\
+  "<input type=\"radio\" name=\"category\" value=\"music\">Music</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"videos\">Videos</input>\n"\
+  "<input type=\"radio\" name=\"category\" value=\"software\">Software</input>" \
-   "<input type=\"radio\" name=\"category\" value=\"other\" checked>Other</input></dd>"\
+  "<input type=\"radio\" name=\"category\" value=\"videos\">Videos</input>\n" \
-   "<dt>Language:</dt><dd>"\
+  "<input type=\"radio\" name=\"category\" value=\"other\" checked>Other</input></dd>" \
-   "<input type=\"radio\" name=\"language\" value=\"no-lang\" checked>none</input>"\
+  "<dt>Language:</dt><dd>" \
-   "<input type=\"radio\" name=\"language\" value=\"en\">English</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"no-lang\" checked>none</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"de\">German</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"en\">English</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"fr\">French</input>"\
+  "<input type=\"radio\" name=\"language\" value=\"de\">German</input>" \
-   "<input type=\"radio\" name=\"language\" value=\"es\">Spanish</input></dd>\n"\
+  "<input type=\"radio\" name=\"language\" value=\"fr\">French</input>" \
-   "<dt>File:</dt><dd>"\
+  "<input type=\"radio\" name=\"language\" value=\"es\">Spanish</input></dd>\n" \
-   "<input type=\"file\" name=\"upload\"/></dd></dl>"\
+  "<dt>File:</dt><dd>" \
-   "<input type=\"submit\" value=\"Send!\"/>\n"\
+  "<input type=\"file\" name=\"upload\"/></dd></dl>" \
-   "</form>\n"\
+  "<input type=\"submit\" value=\"Send!\"/>\n" \
-   "<h1>Download</h1>\n"\
+  "</form>\n" \
-   "<ol>\n"
+  "<h1>Download</h1>\n" \
+  "<ol>\n"
 /**
 * Footer of index page.
@@ -127,16 +131,15 @@
 * NULL-terminated array of supported upload categories.  Should match HTML
 * in the form.
 */
-static const char * const categories[] =
+static const char *const categories[] = {
-  {
+  "books",
-    "books",
+  "images",
-    "images",
+  "music",
-    "music",
+  "software",
-    "software",
+  "videos",
-    "videos",
+  "other",
-    "other",
+  NULL,
-    NULL,
+};
-  };
 /**
@@ -160,15 +163,14 @@ struct Language
 * NULL-terminated array of supported upload categories.  Should match HTML
 * in the form.
 */
-static const struct Language languages[] =
+static const struct Language languages[] = {
-  {
+  { "no-lang", "No language specified" },
-    { "no-lang", "No language specified" },
+  { "en", "English" },
-    { "en", "English" },
+  { "de", "German" },
-    { "de", "German" },
+  { "fr", "French" },
-    { "fr", "French" },
+  { "es", "Spanish" },
-    { "es", "Spanish" },
+  { NULL, NULL },
-    { NULL, NULL },
+};
-  };
 /**
@@ -213,8 +215,8 @@ static void
 mark_as_html (struct MHD_Response *response)
 {
  (void) MHD_add_response_header (response,
-                                  MHD_HTTP_HEADER_CONTENT_TYPE,
+                                  MHD_HTTP_HEADER_CONTENT_TYPE,
-                                  "text/html");
+                                  "text/html");
 }
@@ -267,7 +269,7 @@ struct ResponseDataContext
 */
 static int
 list_directory (struct ResponseDataContext *rdc,
-                const char *dirname)
+                const char *dirname)
 {
  char fullname[PATH_MAX];
  struct stat sbuf;
@@ -277,35 +279,35 @@ list_directory (struct ResponseDataContext *rdc,
  if (NULL == (dir = opendir (dirname)))
    return MHD_NO;
  while (NULL != (de = readdir (dir)))
+  {
+    if ('.' == de->d_name[0])
+      continue;
+    if (sizeof (fullname) <= (size_t)
+        snprintf (fullname, sizeof (fullname),
+                  "%s/%s",
+                  dirname, de->d_name))
+      continue; /* ugh, file too long? how can this be!? */
+    if (0 != stat (fullname, &sbuf))
+      continue; /* ugh, failed to 'stat' */
+    if (! S_ISREG (sbuf.st_mode))
+      continue; /* not a regular file, skip */
+    if (rdc->off + 1024 > rdc->buf_len)
    {
-      if ('.' == de->d_name[0])
+      void *r;
-        continue;
-      if (sizeof (fullname) <= (size_t)
+      if ( (2 * rdc->buf_len + 1024) < rdc->buf_len)
-          snprintf (fullname, sizeof (fullname),
+        break; /* more than SIZE_T _index_ size? Too big for us */
-                    "%s/%s",
+      rdc->buf_len = 2 * rdc->buf_len + 1024;
-                    dirname, de->d_name))
+      if (NULL == (r = realloc (rdc->buf, rdc->buf_len)))
-        continue; /* ugh, file too long? how can this be!? */
+        break; /* out of memory */
-      if (0 != stat (fullname, &sbuf))
+      rdc->buf = r;
-        continue; /* ugh, failed to 'stat' */
-      if (! S_ISREG (sbuf.st_mode))
-        continue; /* not a regular file, skip */
-      if (rdc->off + 1024 > rdc->buf_len)
-        {
-          void *r;
-          if ( (2 * rdc->buf_len + 1024) < rdc->buf_len)
-            break; /* more than SIZE_T _index_ size? Too big for us */
-          rdc->buf_len = 2 * rdc->buf_len + 1024;
-          if (NULL == (r = realloc (rdc->buf, rdc->buf_len)))
-            break; /* out of memory */
-          rdc->buf = r;
-        }
-      rdc->off += snprintf (&rdc->buf[rdc->off],
-                            rdc->buf_len - rdc->off,
-                            "<li><a href=\"/%s\">%s</a></li>\n",
-                            fullname,
-                            de->d_name);
    }
+    rdc->off += snprintf (&rdc->buf[rdc->off],
+                          rdc->buf_len - rdc->off,
+                          "<li><a href=\"/%s\">%s</a></li>\n",
+                          fullname,
+                          de->d_name);
+  }
  (void) closedir (dir);
  return MHD_YES;
 }
@@ -329,65 +331,66 @@ update_directory ()
  rdc.buf_len = initial_allocation;
  if (NULL == (rdc.buf = malloc (rdc.buf_len)))
-    {
+  {
-      update_cached_response (NULL);
+    update_cached_response (NULL);
-      return;
+    return;
-    }
+  }
  rdc.off = snprintf (rdc.buf, rdc.buf_len,
-                      "%s",
+                      "%s",
-                      INDEX_PAGE_HEADER);
+                      INDEX_PAGE_HEADER);
-  for (language_idx = 0; NULL != languages[language_idx].dirname; language_idx++)
+  for (language_idx = 0; NULL != languages[language_idx].dirname;
+       language_idx++)
+  {
+    language = &languages[language_idx];
+    if (0 != stat (language->dirname, &sbuf))
+      continue; /* empty */
+    /* we ensured always +1k room, filenames are ~256 bytes,
+ so there is always still enough space for the header
+ without need for an additional reallocation check. */
+    rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
+                         "<h2>%s</h2>\n",
+                         language->longname);
+    for (category_idx = 0; NULL != categories[category_idx]; category_idx++)
    {
-      language = &languages[language_idx];
+      category = categories[category_idx];
+      snprintf (dir_name, sizeof (dir_name),
+                "%s/%s",
+                language->dirname,
+                category);
+      if (0 != stat (dir_name, &sbuf))
+        continue; /* empty */
-      if (0 != stat (language->dirname, &sbuf))
-        continue; /* empty */
      /* we ensured always +1k room, filenames are ~256 bytes,
-         so there is always still enough space for the header
+         so there is always still enough space for the header
-         without need for an additional reallocation check. */
+         without need for an additional reallocation check. */
      rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                           "<h2>%s</h2>\n",
+                           "<h3>%s</h3>\n",
-                           language->longname);
+                           category);
-      for (category_idx = 0; NULL != categories[category_idx]; category_idx++)
-        {
+      if (MHD_NO == list_directory (&rdc, dir_name))
-          category = categories[category_idx];
+      {
-          snprintf (dir_name, sizeof (dir_name),
+        free (rdc.buf);
-                    "%s/%s",
+        update_cached_response (NULL);
-                    language->dirname,
+        return;
-                    category);
+      }
-          if (0 != stat (dir_name, &sbuf))
-            continue; /* empty */
-          /* we ensured always +1k room, filenames are ~256 bytes,
-             so there is always still enough space for the header
-             without need for an additional reallocation check. */
-          rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                               "<h3>%s</h3>\n",
-                               category);
-          if (MHD_NO == list_directory (&rdc, dir_name))
-            {
-              free (rdc.buf);
-              update_cached_response (NULL);
-              return;
-            }
-        }
    }
+  }
  /* we ensured always +1k room, filenames are ~256 bytes,
     so there is always still enough space for the footer
     without need for a final reallocation check. */
  rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off,
-                       "%s",
+                       "%s",
-                       INDEX_PAGE_FOOTER);
+                       INDEX_PAGE_FOOTER);
  initial_allocation = rdc.buf_len; /* remember for next time */
  response = MHD_create_response_from_buffer (rdc.off,
-                                              rdc.buf,
+                                              rdc.buf,
-                                              MHD_RESPMEM_MUST_FREE);
+                                              MHD_RESPMEM_MUST_FREE);
  mark_as_html (response);
 #if FORCE_CLOSE
  (void) MHD_add_response_header (response,
-                                  MHD_HTTP_HEADER_CONNECTION,
+                                  MHD_HTTP_HEADER_CONNECTION,
-                                  "close");
+                                  "close");
 #endif
  update_cached_response (response);
 }
@@ -446,8 +449,8 @@ struct UploadContext
 */
 static int
 do_append (char **ret,
-           const char *data,
+           const char *data,
-           size_t size)
+           size_t size)
 {
  char *buf;
  size_t old_len;
@@ -459,15 +462,15 @@ do_append (char **ret,
  if (NULL == (buf = malloc (old_len + size + 1)))
    return MHD_NO;
  if (NULL != *ret)
-    {
+  {
-      memcpy (buf,
+    memcpy (buf,
-              *ret,
+            *ret,
-              old_len);
+            old_len);
-      free (*ret);
+    free (*ret);
-    }
+  }
  memcpy (&buf[old_len],
-          data,
+          data,
-          size);
+          size);
  buf[old_len + size] = '\0';
  *ret = buf;
  return MHD_YES;
@@ -495,119 +498,119 @@ do_append (char **ret,
 */
 static int
 process_upload_data (void *cls,
-                     enum MHD_ValueKind kind,
+                     enum MHD_ValueKind kind,
-                     const char *key,
+                     const char *key,
-                     const char *filename,
+                     const char *filename,
-                     const char *content_type,
+                     const char *content_type,
-                     const char *transfer_encoding,
+                     const char *transfer_encoding,
-                     const char *data,
+                     const char *data,
-                     uint64_t off,
+                     uint64_t off,
-                     size_t size)
+                     size_t size)
 {
  struct UploadContext *uc = cls;
  int i;
-  (void)kind;              /* Unused. Silent compiler warning. */
+  (void) kind;              /* Unused. Silent compiler warning. */
-  (void)content_type;      /* Unused. Silent compiler warning. */
+  (void) content_type;      /* Unused. Silent compiler warning. */
-  (void)transfer_encoding; /* Unused. Silent compiler warning. */
+  (void) transfer_encoding; /* Unused. Silent compiler warning. */
-  (void)off;               /* Unused. Silent compiler warning. */
+  (void) off;               /* Unused. Silent compiler warning. */
  if (0 == strcmp (key, "category"))
    return do_append (&uc->category, data, size);
  if (0 == strcmp (key, "language"))
    return do_append (&uc->language, data, size);
  if (0 != strcmp (key, "upload"))
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "Ignoring unexpected form value `%s'\n",
+             "Ignoring unexpected form value `%s'\n",
-               key);
+             key);
-      return MHD_YES; /* ignore */
+    return MHD_YES;   /* ignore */
-    }
+  }
  if (NULL == filename)
-    {
+  {
-      fprintf (stderr, "No filename, aborting upload\n");
+    fprintf (stderr, "No filename, aborting upload\n");
-      return MHD_NO; /* no filename, error */
+    return MHD_NO;   /* no filename, error */
-    }
+  }
  if ( (NULL == uc->category) ||
       (NULL == uc->language) )
+  {
+    fprintf (stderr,
+             "Missing form data for upload `%s'\n",
+             filename);
+    uc->response = request_refused_response;
+    return MHD_NO;
+  }
+  if (-1 == uc->fd)
+  {
+    char fn[PATH_MAX];
+    if ( (NULL != strstr (filename, "..")) ||
+         (NULL != strchr (filename, '/')) ||
+         (NULL != strchr (filename, '\\')) )
    {
-      fprintf (stderr,
-               "Missing form data for upload `%s'\n",
-               filename);
      uc->response = request_refused_response;
      return MHD_NO;
    }
-  if (-1 == uc->fd)
+    /* create directories -- if they don't exist already */
-    {
-      char fn[PATH_MAX];
-      if ( (NULL != strstr (filename, "..")) ||
-           (NULL != strchr (filename, '/')) ||
-           (NULL != strchr (filename, '\\')) )
-        {
-          uc->response = request_refused_response;
-          return MHD_NO;
-        }
-      /* create directories -- if they don't exist already */
 #ifdef WINDOWS
-      (void) mkdir (uc->language);
+    (void) mkdir (uc->language);
 #else
-      (void) mkdir (uc->language, S_IRWXU);
+    (void) mkdir (uc->language, S_IRWXU);
 #endif
-      snprintf (fn, sizeof (fn),
+    snprintf (fn, sizeof (fn),
-                "%s/%s",
+              "%s/%s",
-                uc->language,
+              uc->language,
-                uc->category);
+              uc->category);
 #ifdef WINDOWS
-      (void) mkdir (fn);
+    (void) mkdir (fn);
 #else
-      (void) mkdir (fn, S_IRWXU);
+    (void) mkdir (fn, S_IRWXU);
 #endif
-      /* open file */
+    /* open file */
-      snprintf (fn, sizeof (fn),
+    snprintf (fn, sizeof (fn),
-                "%s/%s/%s",
+              "%s/%s/%s",
-                uc->language,
+              uc->language,
-                uc->category,
+              uc->category,
-                filename);
+              filename);
-      for (i=strlen (fn)-1;i>=0;i--)
+    for (i = strlen (fn) - 1; i>=0; i--)
-        if (! isprint ((unsigned char) fn[i]))
+      if (! isprint ((unsigned char) fn[i]))
-          fn[i] = '_';
+        fn[i] = '_';
-      uc->fd = open (fn,
+    uc->fd = open (fn,
-                     O_CREAT | O_EXCL
+                   O_CREAT | O_EXCL
 #if O_LARGEFILE
-                     | O_LARGEFILE
+                   | O_LARGEFILE
 #endif
-                     | O_WRONLY,
+                   | O_WRONLY,
-                     S_IRUSR | S_IWUSR);
+                   S_IRUSR | S_IWUSR);
-      if (-1 == uc->fd)
+    if (-1 == uc->fd)
-        {
+    {
-          fprintf (stderr,
+      fprintf (stderr,
-                   "Error opening file `%s' for upload: %s\n",
+               "Error opening file `%s' for upload: %s\n",
-                   fn,
+               fn,
-                   strerror (errno));
+               strerror (errno));
-          uc->response = request_refused_response;
+      uc->response = request_refused_response;
-          return MHD_NO;
+      return MHD_NO;
-        }
-      uc->filename = strdup (fn);
    }
+    uc->filename = strdup (fn);
+  }
  if ( (0 != size) &&
       (size != (size_t) write (uc->fd, data, size)) )
+  {
+    /* write failed; likely: disk full */
+    fprintf (stderr,
+             "Error writing to file `%s': %s\n",
+             uc->filename,
+             strerror (errno));
+    uc->response = internal_error_response;
+    close (uc->fd);
+    uc->fd = -1;
+    if (NULL != uc->filename)
    {
-      /* write failed; likely: disk full */
+      unlink (uc->filename);
-      fprintf (stderr,
+      free (uc->filename);
-               "Error writing to file `%s': %s\n",
+      uc->filename = NULL;
-               uc->filename,
-               strerror (errno));
-      uc->response = internal_error_response;
-      close (uc->fd);
-      uc->fd = -1;
-      if (NULL != uc->filename)
-        {
-          unlink (uc->filename);
-          free (uc->filename);
-          uc->filename = NULL;
-        }
-      return MHD_NO;
    }
+    return MHD_NO;
+  }
  return MHD_YES;
 }
@@ -625,32 +628,32 @@ process_upload_data (void *cls,
 */
 static void
 response_completed_callback (void *cls,
-                             struct MHD_Connection *connection,
+                             struct MHD_Connection *connection,
-                             void **con_cls,
+                             void **con_cls,
-                             enum MHD_RequestTerminationCode toe)
+                             enum MHD_RequestTerminationCode toe)
 {
  struct UploadContext *uc = *con_cls;
-  (void)cls;         /* Unused. Silent compiler warning. */
+  (void) cls;         /* Unused. Silent compiler warning. */
-  (void)connection;  /* Unused. Silent compiler warning. */
+  (void) connection;  /* Unused. Silent compiler warning. */
-  (void)toe;         /* Unused. Silent compiler warning. */
+  (void) toe;         /* Unused. Silent compiler warning. */
  if (NULL == uc)
    return; /* this request wasn't an upload request */
  if (NULL != uc->pp)
-    {
+  {
-      MHD_destroy_post_processor (uc->pp);
+    MHD_destroy_post_processor (uc->pp);
-      uc->pp = NULL;
+    uc->pp = NULL;
-    }
+  }
  if (-1 != uc->fd)
  {
    (void) close (uc->fd);
    if (NULL != uc->filename)
-      {
+    {
-        fprintf (stderr,
+      fprintf (stderr,
-                 "Upload of file `%s' failed (incomplete or aborted), removing file.\n",
+               "Upload of file `%s' failed (incomplete or aborted), removing file.\n",
-                 uc->filename);
+               uc->filename);
-        (void) unlink (uc->filename);
+      (void) unlink (uc->filename);
-      }
+    }
  }
  if (NULL != uc->filename)
    free (uc->filename);
@@ -672,12 +675,12 @@ return_directory_response (struct MHD_Connection *connection)
  (void) pthread_mutex_lock (&mutex);
  if (NULL == cached_directory_response)
    ret = MHD_queue_response (connection,
-                              MHD_HTTP_INTERNAL_SERVER_ERROR,
+                              MHD_HTTP_INTERNAL_SERVER_ERROR,
-                              internal_error_response);
+                              internal_error_response);
  else
    ret = MHD_queue_response (connection,
-                              MHD_HTTP_OK,
+                              MHD_HTTP_OK,
-                              cached_directory_response);
+                              cached_directory_response);
  (void) pthread_mutex_unlock (&mutex);
  return ret;
 }
@@ -698,131 +701,131 @@ return_directory_response (struct MHD_Connection *connection)
 */
 static int
 generate_page (void *cls,
-               struct MHD_Connection *connection,
+               struct MHD_Connection *connection,
-               const char *url,
+               const char *url,
-               const char *method,
+               const char *method,
-               const char *version,
+               const char *version,
-               const char *upload_data,
+               const char *upload_data,
-               size_t *upload_data_size, void **ptr)
+               size_t *upload_data_size, void **ptr)
 {
  struct MHD_Response *response;
  int ret;
  int fd;
  struct stat buf;
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
  if (0 != strcmp (url, "/"))
-    {
+  {
-      /* should be file download */
+    /* should be file download */
 #ifdef MHD_HAVE_LIBMAGIC
-      char file_data[MAGIC_HEADER_SIZE];
+    char file_data[MAGIC_HEADER_SIZE];
-      ssize_t got;
+    ssize_t got;
 #endif /* MHD_HAVE_LIBMAGIC */
-      const char *mime;
+    const char *mime;
-      if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
+    if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
-        return MHD_NO;  /* unexpected method (we're not polite...) */
+      return MHD_NO; /* unexpected method (we're not polite...) */
-      fd = -1;
+    fd = -1;
-      if ( (NULL == strstr (&url[1], "..")) &&
+    if ( (NULL == strstr (&url[1], "..")) &&
-           ('/' != url[1]) )
+         ('/' != url[1]) )
-        {
+    {
-          fd = open (&url[1], O_RDONLY);
+      fd = open (&url[1], O_RDONLY);
-          if ( (-1 != fd) &&
+      if ( (-1 != fd) &&
-               ( (0 != fstat (fd, &buf)) ||
+           ( (0 != fstat (fd, &buf)) ||
-                 (! S_ISREG (buf.st_mode)) ) )
+             (! S_ISREG (buf.st_mode)) ) )
-            {
+      {
-              (void) close (fd);
+        (void) close (fd);
-              fd = -1;
+        fd = -1;
-            }
+      }
-        }
+    }
-      if (-1 == fd)
+    if (-1 == fd)
-        return MHD_queue_response (connection,
+      return MHD_queue_response (connection,
-                                   MHD_HTTP_NOT_FOUND,
+                                 MHD_HTTP_NOT_FOUND,
-                                   file_not_found_response);
+                                 file_not_found_response);
 #ifdef MHD_HAVE_LIBMAGIC
-      /* read beginning of the file to determine mime type  */
+    /* read beginning of the file to determine mime type  */
-      got = read (fd, file_data, sizeof (file_data));
+    got = read (fd, file_data, sizeof (file_data));
-      (void) lseek (fd, 0, SEEK_SET);
+    (void) lseek (fd, 0, SEEK_SET);
-      if (-1 != got)
+    if (-1 != got)
-        mime = magic_buffer (magic, file_data, got);
+      mime = magic_buffer (magic, file_data, got);
-      else
+    else
 #endif /* MHD_HAVE_LIBMAGIC */
-        mime = NULL;
+    mime = NULL;
-      if (NULL == (response = MHD_create_response_from_fd (buf.st_size,
+    if (NULL == (response = MHD_create_response_from_fd (buf.st_size,
-                                                           fd)))
+                                                         fd)))
-        {
+    {
-          /* internal error (i.e. out of memory) */
+      /* internal error (i.e. out of memory) */
-          (void) close (fd);
+      (void) close (fd);
-          return MHD_NO;
+      return MHD_NO;
-        }
-      /* add mime type if we had one */
-      if (NULL != mime)
-        (void) MHD_add_response_header (response,
-                                        MHD_HTTP_HEADER_CONTENT_TYPE,
-                                        mime);
-      ret = MHD_queue_response (connection,
-                                MHD_HTTP_OK,
-                                response);
-      MHD_destroy_response (response);
-      return ret;
    }
+    /* add mime type if we had one */
+    if (NULL != mime)
+      (void) MHD_add_response_header (response,
+                                      MHD_HTTP_HEADER_CONTENT_TYPE,
+                                      mime);
+    ret = MHD_queue_response (connection,
+                              MHD_HTTP_OK,
+                              response);
+    MHD_destroy_response (response);
+    return ret;
+  }
  if (0 == strcmp (method, MHD_HTTP_METHOD_POST))
+  {
+    /* upload! */
+    struct UploadContext *uc = *ptr;
+    if (NULL == uc)
+    {
+      if (NULL == (uc = malloc (sizeof (struct UploadContext))))
+        return MHD_NO; /* out of memory, close connection */
+      memset (uc, 0, sizeof (struct UploadContext));
+      uc->fd = -1;
+      uc->connection = connection;
+      uc->pp = MHD_create_post_processor (connection,
+                                          64 * 1024 /* buffer size */,
+                                          &process_upload_data, uc);
+      if (NULL == uc->pp)
+      {
+        /* out of memory, close connection */
+        free (uc);
+        return MHD_NO;
+      }
+      *ptr = uc;
+      return MHD_YES;
+    }
+    if (0 != *upload_data_size)
+    {
+      if (NULL == uc->response)
+        (void) MHD_post_process (uc->pp,
+                                 upload_data,
+                                 *upload_data_size);
+      *upload_data_size = 0;
+      return MHD_YES;
+    }
+    /* end of upload, finish it! */
+    MHD_destroy_post_processor (uc->pp);
+    uc->pp = NULL;
+    if (-1 != uc->fd)
+    {
+      close (uc->fd);
+      uc->fd = -1;
+    }
+    if (NULL != uc->response)
+    {
+      return MHD_queue_response (connection,
+                                 MHD_HTTP_FORBIDDEN,
+                                 uc->response);
+    }
+    else
    {
-      /* upload! */
+      update_directory ();
-      struct UploadContext *uc = *ptr;
+      return return_directory_response (connection);
-      if (NULL == uc)
-        {
-          if (NULL == (uc = malloc (sizeof (struct UploadContext))))
-            return MHD_NO; /* out of memory, close connection */
-          memset (uc, 0, sizeof (struct UploadContext));
-          uc->fd = -1;
-          uc->connection = connection;
-          uc->pp = MHD_create_post_processor (connection,
-                                              64 * 1024 /* buffer size */,
-                                              &process_upload_data, uc);
-          if (NULL == uc->pp)
-            {
-              /* out of memory, close connection */
-              free (uc);
-              return MHD_NO;
-            }
-          *ptr = uc;
-          return MHD_YES;
-        }
-      if (0 != *upload_data_size)
-        {
-          if (NULL == uc->response)
-            (void) MHD_post_process (uc->pp,
-                                     upload_data,
-                                     *upload_data_size);
-          *upload_data_size = 0;
-          return MHD_YES;
-        }
-      /* end of upload, finish it! */
-      MHD_destroy_post_processor (uc->pp);
-      uc->pp = NULL;
-      if (-1 != uc->fd)
-        {
-          close (uc->fd);
-          uc->fd = -1;
-        }
-      if (NULL != uc->response)
-        {
-          return MHD_queue_response (connection,
-                                     MHD_HTTP_FORBIDDEN,
-                                     uc->response);
-        }
-      else
-        {
-          update_directory ();
-          return return_directory_response (connection);
-        }
    }
+  }
  if (0 == strcmp (method, MHD_HTTP_METHOD_GET))
  {
    return return_directory_response (connection);
@@ -830,8 +833,8 @@ generate_page (void *cls,
  /* unexpected request, refuse */
  return MHD_queue_response (connection,
-                             MHD_HTTP_FORBIDDEN,
+                             MHD_HTTP_FORBIDDEN,
-                             request_refused_response);
+                             request_refused_response);
 }
@@ -844,7 +847,7 @@ generate_page (void *cls,
 static void
 catcher (int sig)
 {
-  (void)sig;    /* Unused. Silent compiler warning. */
+  (void) sig;  /* Unused. Silent compiler warning. */
  /* do nothing */
 }
@@ -873,53 +876,53 @@ ignore_sigpipe (void)
 /* test server key */
 const char srv_signed_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n"
-  "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n"
+                                  "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n"
-  "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n"
+                                  "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n"
-  "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n"
+                                  "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n"
-  "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n"
+                                  "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n"
-  "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n"
+                                  "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n"
-  "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n"
+                                  "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n"
-  "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n"
+                                  "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n"
-  "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n"
+                                  "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n"
-  "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n"
+                                  "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n"
-  "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n"
+                                  "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n"
-  "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n"
+                                  "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n"
-  "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n"
+                                  "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n"
-  "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n"
+                                  "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n"
-  "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n"
+                                  "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n"
-  "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n"
+                                  "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n"
-  "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n"
+                                  "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n"
-  "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n"
+                                  "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n"
-  "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n"
+                                  "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n"
-  "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n"
+                                  "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n"
-  "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n"
+                                  "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n"
-  "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n"
+                                  "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n"
-  "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n"
+                                  "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n"
-  "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n"
+                                  "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n"
-  "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n"
+                                  "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n"
-  "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n"
+                                  "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n"
-  "-----END RSA PRIVATE KEY-----\n";
+                                  "-----END RSA PRIVATE KEY-----\n";
 /* test server CA signed certificates */
 const char srv_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
-  "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
+                                   "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n"
-  "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
+                                   "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n"
-  "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
+                                   "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n"
-  "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n"
+                                   "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n"
-  "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n"
+                                   "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n"
-  "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n"
+                                   "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n"
-  "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n"
+                                   "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n"
-  "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n"
+                                   "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n"
-  "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
+                                   "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n"
-  "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n"
+                                   "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n"
-  "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n"
+                                   "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n"
-  "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n"
+                                   "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n"
-  "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n"
+                                   "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n"
-  "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n"
+                                   "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n"
-  "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n"
+                                   "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n"
-  "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n"
+                                   "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n"
-  "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n"
+                                   "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n"
-  "-----END CERTIFICATE-----\n";
+                                   "-----END CERTIFICATE-----\n";
 /**
@@ -940,11 +943,11 @@ main (int argc, char *const *argv)
  if ( (argc != 2) ||
       (1 != sscanf (argv[1], "%u", &port)) ||
       (UINT16_MAX < port) )
-    {
+  {
-      fprintf (stderr,
+    fprintf (stderr,
-               "%s PORT\n", argv[0]);
+             "%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  #ifndef MINGW
  ignore_sigpipe ();
  #endif
@@ -954,35 +957,46 @@ main (int argc, char *const *argv)
 #endif /* MHD_HAVE_LIBMAGIC */
  (void) pthread_mutex_init (&mutex, NULL);
-  file_not_found_response = MHD_create_response_from_buffer (strlen (FILE_NOT_FOUND_PAGE),
+  file_not_found_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) FILE_NOT_FOUND_PAGE,
+                                                               FILE_NOT_FOUND_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                             (void *)
+                                                             FILE_NOT_FOUND_PAGE,
+                                                             MHD_RESPMEM_PERSISTENT);
  mark_as_html (file_not_found_response);
-  request_refused_response = MHD_create_response_from_buffer (strlen (REQUEST_REFUSED_PAGE),
+  request_refused_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) REQUEST_REFUSED_PAGE,
+                                                                REQUEST_REFUSED_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                              (void *)
+                                                              REQUEST_REFUSED_PAGE,
+                                                              MHD_RESPMEM_PERSISTENT);
  mark_as_html (request_refused_response);
-  internal_error_response = MHD_create_response_from_buffer (strlen (INTERNAL_ERROR_PAGE),
+  internal_error_response = MHD_create_response_from_buffer (strlen (
-                                                             (void *) INTERNAL_ERROR_PAGE,
+                                                               INTERNAL_ERROR_PAGE),
-                                                             MHD_RESPMEM_PERSISTENT);
+                                                             (void *)
+                                                             INTERNAL_ERROR_PAGE,
+                                                             MHD_RESPMEM_PERSISTENT);
  mark_as_html (internal_error_response);
  update_directory ();
-  d = MHD_start_daemon (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_TLS,
+  d = MHD_start_daemon (MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD
+                        | MHD_USE_ERROR_LOG | MHD_USE_TLS,
                        port,
                        NULL, NULL,
-                        &generate_page, NULL,
+                        &generate_page, NULL,
-                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024),
+                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256
+                                                                      * 1024),
 #if PRODUCTION
-                        MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64),
+                        MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64),
 #endif
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */),
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned
-                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
+                                                        int) (120 /* seconds */),
-                        MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL,
+                        MHD_OPTION_THREAD_POOL_SIZE, (unsigned
-                        /* Optionally, the gnutls_load_file() can be used to
+                                                      int) NUMBER_OF_THREADS,
-                           load the key and the certificate from file. */
+                        MHD_OPTION_NOTIFY_COMPLETED,
-                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
+                        &response_completed_callback, NULL,
-                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        /* Optionally, the gnutls_load_file() can be used to
-                        MHD_OPTION_END);
+                           load the key and the certificate from file. */
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        MHD_OPTION_END);
  if (NULL == d)
    return 1;
  fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n");
diff --git a/src/examples/digest_auth_example.c b/src/examples/digest_auth_example.c
index 889967fb..720576cd 100644
--- a/src/examples/digest_auth_example.c
+++ b/src/examples/digest_auth_example.c
@@ -26,9 +26,11 @@
 #include <microhttpd.h>
 #include <stdlib.h>
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>Access granted</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>Access granted</body></html>"
-#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
+#define DENIED \
+  "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
 #define MY_OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"
@@ -45,51 +47,52 @@ ahc_echo (void *cls,
  const char *password = "testpass";
  const char *realm = "test@example.com";
  int ret;
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)method;            /* Unused. Silent compiler warning. */
+  (void) method;            /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
-  (void)ptr;               /* Unused. Silent compiler warning. */
+  (void) ptr;               /* Unused. Silent compiler warning. */
-  username = MHD_digest_auth_get_username(connection);
+  username = MHD_digest_auth_get_username (connection);
  if (NULL == username)
-    {
+  {
-      response = MHD_create_response_from_buffer(strlen (DENIED),
+    response = MHD_create_response_from_buffer (strlen (DENIED),
-                                                 DENIED,
+                                                DENIED,
-                                                 MHD_RESPMEM_PERSISTENT);
+                                                MHD_RESPMEM_PERSISTENT);
-      ret = MHD_queue_auth_fail_response(connection, realm,
+    ret = MHD_queue_auth_fail_response (connection, realm,
-                                         MY_OPAQUE_STR,
+                                        MY_OPAQUE_STR,
-                                         response,
+                                        response,
-                                         MHD_NO);
+                                        MHD_NO);
-      MHD_destroy_response(response);
+    MHD_destroy_response (response);
-      return ret;
+    return ret;
-    }
+  }
-  ret = MHD_digest_auth_check(connection, realm,
+  ret = MHD_digest_auth_check (connection, realm,
-                              username,
+                               username,
-                              password,
+                               password,
-                              300);
+                               300);
  MHD_free (username);
  if ( (ret == MHD_INVALID_NONCE) ||
       (ret == MHD_NO) )
-    {
+  {
-      response = MHD_create_response_from_buffer(strlen (DENIED),
+    response = MHD_create_response_from_buffer (strlen (DENIED),
-                                                 DENIED,
+                                                DENIED,
-                                                 MHD_RESPMEM_PERSISTENT);
+                                                MHD_RESPMEM_PERSISTENT);
-      if (NULL == response)
+    if (NULL == response)
-        return MHD_NO;
+      return MHD_NO;
-      ret = MHD_queue_auth_fail_response(connection, realm,
+    ret = MHD_queue_auth_fail_response (connection, realm,
-                                         MY_OPAQUE_STR,
+                                        MY_OPAQUE_STR,
-                                         response,
+                                        response,
-                                         (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
+                                        (ret == MHD_INVALID_NONCE) ? MHD_YES :
-      MHD_destroy_response(response);
+                                        MHD_NO);
-      return ret;
+    MHD_destroy_response (response);
-    }
+    return ret;
-  response = MHD_create_response_from_buffer(strlen(PAGE), PAGE,
+  }
-                                             MHD_RESPMEM_PERSISTENT);
+  response = MHD_create_response_from_buffer (strlen (PAGE), PAGE,
-  ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+                                              MHD_RESPMEM_PERSISTENT);
-  MHD_destroy_response(response);
+  ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+  MHD_destroy_response (response);
  return ret;
 }
@@ -104,40 +107,41 @@ main (int argc, char *const *argv)
  struct MHD_Daemon *d;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
-  fd = open("/dev/urandom", O_RDONLY);
+  fd = open ("/dev/urandom", O_RDONLY);
  if (-1 == fd)
-    {
+  {
-      fprintf (stderr, "Failed to open `%s': %s\n",
+    fprintf (stderr, "Failed to open `%s': %s\n",
-               "/dev/urandom",
+             "/dev/urandom",
-               strerror (errno));
+             strerror (errno));
-      return 1;
+    return 1;
-    }
+  }
  off = 0;
  while (off < 8)
+  {
+    len = read (fd, rnd, 8);
+    if (len == -1)
    {
-      len = read(fd, rnd, 8);
+      fprintf (stderr, "Failed to read `%s': %s\n",
-      if (len == -1)
+               "/dev/urandom",
-        {
+               strerror (errno));
-          fprintf (stderr, "Failed to read `%s': %s\n",
+      (void) close (fd);
-                   "/dev/urandom",
+      return 1;
-                   strerror (errno));
-          (void) close (fd);
-          return 1;
-        }
-      off += len;
    }
-  (void) close(fd);
+    off += len;
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+  }
+  (void) close (fd);
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION
+                        | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, PAGE,
-                        MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd,
+                        MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd,
-                        MHD_OPTION_NONCE_NC_SIZE, 300,
+                        MHD_OPTION_NONCE_NC_SIZE, 300,
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
-                        MHD_OPTION_END);
+                        MHD_OPTION_END);
  if (d == NULL)
    return 1;
  (void) getc (stdin);
diff --git a/src/examples/dual_stack_example.c b/src/examples/dual_stack_example.c
index 31b25438..ffacec4a 100644
--- a/src/examples/dual_stack_example.c
+++ b/src/examples/dual_stack_example.c
@@ -25,7 +25,8 @@
 #include "platform.h"
 #include <microhttpd.h>
-#define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
+#define PAGE \
+  "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 static int
 ahc_echo (void *cls,
@@ -39,23 +40,23 @@ ahc_echo (void *cls,
  const char *me = cls;
  struct MHD_Response *response;
  int ret;
-  (void)url;               /* Unused. Silent compiler warning. */
+  (void) url;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, "GET"))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  *ptr = NULL;                  /* reset when done */
  response = MHD_create_response_from_buffer (strlen (me),
-                                              (void *) me,
+                                              (void *) me,
-                                              MHD_RESPMEM_PERSISTENT);
+                                              MHD_RESPMEM_PERSISTENT);
  ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
  MHD_destroy_response (response);
  return ret;
@@ -68,15 +69,16 @@ main (int argc, char *const *argv)
  struct MHD_Daemon *d;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
-  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_DUAL_STACK,
+  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
-                        atoi (argv[1]),
+                        | MHD_USE_DUAL_STACK,
-                        NULL, NULL, &ahc_echo, PAGE,
+                        atoi (argv[1]),
-                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+                        NULL, NULL, &ahc_echo, PAGE,
-                        MHD_OPTION_END);
+                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
+                        MHD_OPTION_END);
  (void) getc (stdin);
  MHD_stop_daemon (d);
  return 0;
diff --git a/src/examples/fileserver_example_dirs.c b/src/examples/fileserver_example_dirs.c
index 8c37f219..2b544b69 100644
--- a/src/examples/fileserver_example_dirs.c
+++ b/src/examples/fileserver_example_dirs.c
@@ -28,7 +28,8 @@
 #include <microhttpd.h>
 #include <unistd.h>
-#define PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define PAGE \
+  "<html><head><title>File not found</title></head><body>File not found</body></html>"
 static ssize_t
@@ -66,17 +67,17 @@ dir_reader (void *cls, uint64_t pos, char *buf, size_t max)
  if (max < 512)
    return 0;
-  (void)pos; /* 'pos' is ignored as function return next one single entry per call. */
+  (void) pos; /* 'pos' is ignored as function return next one single entry per call. */
  do
-    {
+  {
-      e = readdir (dir);
+    e = readdir (dir);
-      if (e == NULL)
+    if (e == NULL)
-        return MHD_CONTENT_READER_END_OF_STREAM;
+      return MHD_CONTENT_READER_END_OF_STREAM;
  } while (e->d_name[0] == '.');
  return snprintf (buf, max,
-                   "<a href=\"/%s\">%s</a><br>",
+                   "<a href=\"/%s\">%s</a><br>",
-                   e->d_name,
+                   e->d_name,
-                   e->d_name);
+                   e->d_name);
 }
@@ -87,7 +88,7 @@ ahc_echo (void *cls,
          const char *method,
          const char *version,
          const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **ptr)
 {
  static int aptr;
  struct MHD_Response *response;
@@ -97,90 +98,90 @@ ahc_echo (void *cls,
  DIR *dir;
  struct stat buf;
  char emsg[1024];
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  *ptr = NULL;                  /* reset when done */
  file = fopen (&url[1], "rb");
  if (NULL != file)
+  {
+    fd = fileno (file);
+    if (-1 == fd)
    {
-      fd = fileno (file);
+      (void) fclose (file);
-      if (-1 == fd)
+      return MHD_NO;     /* internal error */
-        {
-          (void) fclose (file);
-          return MHD_NO; /* internal error */
-        }
-      if ( (0 != fstat (fd, &buf)) ||
-           (! S_ISREG (buf.st_mode)) )
-        {
-          /* not a regular file, refuse to serve */
-          fclose (file);
-          file = NULL;
-        }
    }
+    if ( (0 != fstat (fd, &buf)) ||
+         (! S_ISREG (buf.st_mode)) )
+    {
+      /* not a regular file, refuse to serve */
+      fclose (file);
+      file = NULL;
+    }
+  }
  if (NULL == file)
+  {
+    dir = opendir (".");
+    if (NULL == dir)
    {
-      dir = opendir (".");
+      /* most likely cause: more concurrent requests than
-      if (NULL == dir)
+         available file descriptors / 2 */
-        {
+      snprintf (emsg,
-          /* most likely cause: more concurrent requests than
+                sizeof (emsg),
-             available file descriptors / 2 */
+                "Failed to open directory `.': %s\n",
-          snprintf (emsg,
+                strerror (errno));
-                    sizeof (emsg),
+      response = MHD_create_response_from_buffer (strlen (emsg),
-                    "Failed to open directory `.': %s\n",
+                                                  emsg,
-                    strerror (errno));
+                                                  MHD_RESPMEM_MUST_COPY);
-          response = MHD_create_response_from_buffer (strlen (emsg),
+      if (NULL == response)
-                                                      emsg,
+        return MHD_NO;
-                                                      MHD_RESPMEM_MUST_COPY);
+      ret = MHD_queue_response (connection,
-          if (NULL == response)
+                                MHD_HTTP_SERVICE_UNAVAILABLE,
-            return MHD_NO;
+                                response);
-          ret = MHD_queue_response (connection,
+      MHD_destroy_response (response);
-                                    MHD_HTTP_SERVICE_UNAVAILABLE,
-                                    response);
-          MHD_destroy_response (response);
-        }
-      else
-        {
-          response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
-                                                        32 * 1024,
-                                                        &dir_reader,
-                                                        dir,
-                                                        &dir_free_callback);
-          if (NULL == response)
-            {
-              closedir (dir);
-              return MHD_NO;
-            }
-          ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-          MHD_destroy_response (response);
-        }
    }
-  else
+    else
    {
-      response = MHD_create_response_from_callback (buf.st_size, 32 * 1024,     /* 32k page size */
+      response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
-                                                    &file_reader,
+                                                    32 * 1024,
-                                                    file,
+                                                    &dir_reader,
-                                                    &file_free_callback);
+                                                    dir,
+                                                    &dir_free_callback);
      if (NULL == response)
-        {
+      {
-          fclose (file);
+        closedir (dir);
-          return MHD_NO;
+        return MHD_NO;
-        }
+      }
      ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
      MHD_destroy_response (response);
    }
+  }
+  else
+  {
+    response = MHD_create_response_from_callback (buf.st_size, 32 * 1024,       /* 32k page size */
+                                                  &file_reader,
+                                                  file,
+                                                  &file_free_callback);
+    if (NULL == response)
+    {
+      fclose (file);
+      return MHD_NO;
+    }
+    ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+    MHD_destroy_response (response);
+  }
  return ret;
 }
@@ -191,11 +192,12 @@ main (int argc, char *const *argv)
  struct MHD_Daemon *d;
  if (argc != 2)
-    {
+  {
-      printf ("%s PORT\n", argv[0]);
+    printf ("%s PORT\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION
+                        | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
  if (NULL == d)
diff --git a/src/examples/fileserver_example_external_select.c b/src/examples/fileserver_example_external_select.c
index 6aea6dbf..187cdf7e 100644
--- a/src/examples/fileserver_example_external_select.c
+++ b/src/examples/fileserver_example_external_select.c
@@ -27,7 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
-#define PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define PAGE \
+  "<html><head><title>File not found</title></head><body>File not found</body></html>"
 static ssize_t
 file_reader (void *cls, uint64_t pos, char *buf, size_t max)
@@ -54,7 +55,7 @@ ahc_echo (void *cls,
          const char *method,
          const char *version,
          const char *upload_data,
-          size_t *upload_data_size, void **ptr)
+          size_t *upload_data_size, void **ptr)
 {
  static int aptr;
  struct MHD_Response *response;
@@ -62,61 +63,61 @@ ahc_echo (void *cls,
  FILE *file;
  int fd;
  struct stat buf;
-  (void)cls;               /* Unused. Silent compiler warning. */
+  (void) cls;               /* Unused. Silent compiler warning. */
-  (void)version;           /* Unused. Silent compiler warning. */
+  (void) version;           /* Unused. Silent compiler warning. */
-  (void)upload_data;       /* Unused. Silent compiler warning. */
+  (void) upload_data;       /* Unused. Silent compiler warning. */
-  (void)upload_data_size;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size;  /* Unused. Silent compiler warning. */
  if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
    return MHD_NO;              /* unexpected method */
  if (&aptr != *ptr)
-    {
+  {
-      /* do never respond on first call */
+    /* do never respond on first call */
-      *ptr = &aptr;
+    *ptr = &aptr;
-      return MHD_YES;
+    return MHD_YES;
-    }
+  }
  *ptr = NULL;                  /* reset when done */
  file = fopen (&url[1], "rb");
  if (NULL != file)
+  {
+    fd = fileno (file);
+    if (-1 == fd)
    {
-      fd = fileno (file);
+      (void) fclose (file);
-      if (-1 == fd)
+      return MHD_NO;     /* internal error */
-        {
-          (void) fclose (file);
-          return MHD_NO; /* internal error */
-        }
-      if ( (0 != fstat (fd, &buf)) ||
-           (! S_ISREG (buf.st_mode)) )
-        {
-          /* not a regular file, refuse to serve */
-          fclose (file);
-          file = NULL;
-        }
    }
+    if ( (0 != fstat (fd, &buf)) ||
-  if (NULL == file)
+         (! S_ISREG (buf.st_mode)) )
    {
-      response = MHD_create_response_from_buffer (strlen (PAGE),
+      /* not a regular file, refuse to serve */
-                                                  (void *) PAGE,
+      fclose (file);
-                                                  MHD_RESPMEM_PERSISTENT);
+      file = NULL;
-      ret = MHD_queue_response (connection, MHD_HTTP_NOT_FOUND, response);
-      MHD_destroy_response (response);
    }
+  }
+  if (NULL == file)
+  {
+    response = MHD_create_response_from_buffer (strlen (PAGE),
+                                                (void *) PAGE,
+                                                MHD_RESPMEM_PERSISTENT);
+    ret = MHD_queue_response (connection, MHD_HTTP_NOT_FOUND, response);
+    MHD_destroy_response (response);
+  }
  else
+  {
+    response = MHD_create_response_from_callback (buf.st_size, 32 * 1024,       /* 32k page size */
+                                                  &file_reader,
+                                                  file,
+                                                  &free_callback);
+    if (NULL == response)
    {
-      response = MHD_create_response_from_callback (buf.st_size, 32 * 1024,     /* 32k page size */
+      fclose (file);
-                                                    &file_reader,
+      return MHD_NO;
-                                                    file,
-                                                    &free_callback);
-      if (NULL == response)
-        {
-          fclose (file);
-          return MHD_NO;
-        }
-      ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-      MHD_destroy_response (response);
    }
+    ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+    MHD_destroy_response (response);
+  }
  return ret;
 }
@@ -135,10 +136,10 @@ main (int argc, char *const *argv)
  MHD_UNSIGNED_LONG_LONG mhd_timeout;
  if (argc != 3)
-    {
+  {
-      printf ("%s PORT SECONDS-TO-RUN\n", argv[0]);
+    printf ("%s PORT SECONDS-TO-RUN\n", argv[0]);
-      return 1;
+    return 1;
-    }
+  }
  d = MHD_start_daemon (MHD_USE_ERROR_LOG,
                        atoi (argv[1]),
                        NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
@@ -146,30 +147,30 @@ main (int argc, char *const *argv)
    return 1;
  end = time (NULL) + atoi (argv[2]);
  while ((t = time (NULL)) < end)
+  {
+    tv.tv_sec = end - t;
+    tv.tv_usec = 0;
+    max = 0;
+    FD_ZERO (&rs);
+    FD_ZERO (&ws);
+    FD_ZERO (&es);
+    if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+      break; /* fatal internal error */
+    if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES)
+    {
+      if (((MHD_UNSIGNED_LONG_LONG) tv.tv_sec) < mhd_timeout / 1000LL)
+      {
+        tv.tv_sec = mhd_timeout / 1000LL;
+        tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000LL)) * 1000LL;
+      }
+    }
+    if (-1 == select (max + 1, &rs, &ws, &es, &tv))
    {
-      tv.tv_sec = end - t;
+      if (EINTR != errno)
-      tv.tv_usec = 0;
+        abort ();
-      max = 0;
-      FD_ZERO (&rs);
-      FD_ZERO (&ws);
-      FD_ZERO (&es);
-      if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
-        break; /* fatal internal error */
-      if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES)
-        {
-          if (((MHD_UNSIGNED_LONG_LONG)tv.tv_sec) < mhd_timeout / 1000LL)
-            {
-              tv.tv_sec = mhd_timeout / 1000LL;
-              tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000LL)) * 1000LL;
-            }
-        }
-      if (-1 == select (max + 1, &rs, &ws, &es, &tv))
-        {
-          if (EINTR != er
author	Christian Grothoff <christian@grothoff.org>	2019-10-17 16:56:41 +0200
committer	Christian Grothoff <christian@grothoff.org>	2019-10-17 16:56:41 +0200
commit	972103dc288e2a2396e060018e7c3733f29a940d (patch)
tree	aeb0b3a182d5168f12752928d3204342c9581e91
parent	cbbfd0591fc639ddd21a5850f54f403fb7394174 (diff)
download	libmicrohttpd-972103dc288e2a2396e060018e7c3733f29a940d.tar.gz libmicrohttpd-972103dc288e2a2396e060018e7c3733f29a940d.zip