1 files changed, 99 insertions, 89 deletions

diff --git a/src/testcurl/test_concurrent_stop.c b/src/testcurl/test_concurrent_stop.c
index 71202add..02f4fffd 100644
--- a/src/testcurl/test_concurrent_stop.c
+++ b/src/testcurl/test_concurrent_stop.c
@@ -33,10 +33,10 @@
 #include <pthread.h>
 #include "gauger.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
 
@@ -81,50 +81,52 @@ thread_watchdog (void *param)
 
   seconds_passed = 0;
   while (watchdog_continue) /* Poor threads sync, but works for testing. */
+  {
+    if (0 == sleep (1))   /* Poor accuracy, but enough for testing. */
+      seconds_passed++;
+    if (timeout_val < seconds_passed)
     {
-      if (0 == sleep (1)) /* Poor accuracy, but enough for testing. */
-        seconds_passed++;
-      if (timeout_val < seconds_passed)
-        {
-          fprintf (stderr, "%s timeout expired.\n", watchdog_obj ? watchdog_obj : "Watchdog");
-          fflush (stderr);
-          _exit(16);
-        }
+      fprintf (stderr, "%s timeout expired.\n", watchdog_obj ? watchdog_obj :
+               "Watchdog");
+      fflush (stderr);
+      _exit (16);
     }
+  }
   return NULL;
 }
 
 pthread_t watchdog_tid;
 
 static void
-start_watchdog(int timeout, const char *obj_name)
+start_watchdog (int timeout, const char *obj_name)
 {
   watchdog_continue = 1;
   watchdog_obj = obj_name;
-  if (0 != pthread_create(&watchdog_tid, NULL, &thread_watchdog, (void*)(intptr_t)timeout))
-    {
-      fprintf(stderr, "Failed to start watchdog.\n");
-      _exit (99);
-    }
+  if (0 != pthread_create (&watchdog_tid, NULL, &thread_watchdog,
+                           (void*) (intptr_t) timeout))
+  {
+    fprintf (stderr, "Failed to start watchdog.\n");
+    _exit (99);
+  }
 }
 
 static void
-stop_watchdog(void)
+stop_watchdog (void)
 {
   watchdog_continue = 0;
   if (0 != pthread_join (watchdog_tid, NULL))
-    {
-      fprintf(stderr, "Failed to stop watchdog.\n");
-      _exit (99);
-    }
+  {
+    fprintf (stderr, "Failed to stop watchdog.\n");
+    _exit (99);
+  }
 }
 
 static size_t
 copyBuffer (void *ptr,
-            size_t size, size_t nmemb,
-            void *ctx)
+            size_t size, size_t nmemb,
+            void *ctx)
 {
-  (void)ptr;(void)ctx;  /* Unused. Silent compiler warning. */
+  (void) ptr; (void) ctx;  /* Unused. Silent compiler warning. */
   return size * nmemb;
 }
 
@@ -142,16 +144,16 @@ ahc_echo (void *cls,
   static int ptr;
   const char *me = cls;
   int ret;
-  (void)url;(void)version;                      /* Unused. Silent compiler warning. */
-  (void)upload_data;(void)upload_data_size;     /* Unused. Silent compiler warning. */
+  (void) url; (void) version;                      /* Unused. Silent compiler warning. */
+  (void) upload_data; (void) upload_data_size;     /* Unused. Silent compiler warning. */
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
   if (&ptr != *unused)
-    {
-      *unused = &ptr;
-      return MHD_YES;
-    }
+  {
+    *unused = &ptr;
+    return MHD_YES;
+  }
   *unused = NULL;
   ret = MHD_queue_response (connection,
                             MHD_HTTP_OK,
@@ -166,15 +168,15 @@ thread_gets (void *param)
 {
   CURL *c;
   CURLcode errornum;
-  char * const url = (char*) param;
+  char *const url = (char*) param;
 
   c = NULL;
   c = curl_easy_init ();
   if (NULL == c)
-    {
-      fprintf(stderr, "curl_easy_init failed.\n");
-      _exit(99);
-    }
+  {
+    fprintf (stderr, "curl_easy_init failed.\n");
+    _exit (99);
+  }
   curl_easy_setopt (c, CURLOPT_URL, url);
   curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
   curl_easy_setopt (c, CURLOPT_WRITEDATA, NULL);
@@ -190,62 +192,62 @@ thread_gets (void *param)
      crashes on my system! */
   curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1L);
   while (continue_requesting)
+  {
+    errornum = curl_easy_perform (c);
+    if (CURLE_OK != errornum)
     {
-      errornum = curl_easy_perform (c);
-      if (CURLE_OK != errornum)
-        {
-          curl_easy_cleanup (c);
-          return NULL;
-        }
+      curl_easy_cleanup (c);
+      return NULL;
     }
+  }
   curl_easy_cleanup (c);
   return NULL;
 }
 
 static void *
-do_gets (void * param)
+do_gets (void *param)
 {
   int j;
   pthread_t par[PAR];
   char url[64];
-  int port = (int)(intptr_t)param;
+  int port = (int) (intptr_t) param;
 
   snprintf (url,
             sizeof (url),
             "http://127.0.0.1:%d/hello_world",
             port);
 
-  for (j=0;j<PAR;j++)
-    {
-      if (0 != pthread_create(&par[j], NULL, &thread_gets, (void*)url))
-        {
-          fprintf(stderr, "pthread_create failed.\n");
-          continue_requesting = 0;
-          for (j--; j >= 0; j--)
-            {
-              pthread_join(par[j], NULL);
-            }
-          _exit(99);
-        }
-    }
-  (void)sleep (1);
-  for (j=0;j<PAR;j++)
+  for (j = 0; j<PAR; j++)
+  {
+    if (0 != pthread_create (&par[j], NULL, &thread_gets, (void*) url))
     {
-      pthread_join(par[j], NULL);
+      fprintf (stderr, "pthread_create failed.\n");
+      continue_requesting = 0;
+      for (j--; j >= 0; j--)
+      {
+        pthread_join (par[j], NULL);
+      }
+      _exit (99);
     }
+  }
+  (void) sleep (1);
+  for (j = 0; j<PAR; j++)
+  {
+    pthread_join (par[j], NULL);
+  }
   return NULL;
 }
 
 
-pthread_t start_gets(int port)
+pthread_t start_gets (int port)
 {
   pthread_t tid;
   continue_requesting = 1;
-  if (0 != pthread_create(&tid, NULL, &do_gets, (void*)(intptr_t)port))
-    {
-      fprintf(stderr, "pthread_create failed.\n");
-      _exit(99);
-    }
+  if (0 != pthread_create (&tid, NULL, &do_gets, (void*) (intptr_t) port))
+  {
+    fprintf (stderr, "pthread_create failed.\n");
+    _exit (99);
+  }
   return tid;
 }
 
@@ -257,7 +259,9 @@ testMultithreadedGet (int port,
   struct MHD_Daemon *d;
   pthread_t p;
 
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG  | poll_flag,
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION
+                        | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
+                        | poll_flag,
                         port,
                         NULL, NULL,
                         &ahc_echo, "GET",
@@ -265,18 +269,20 @@ testMultithreadedGet (int port,
   if (d == NULL)
     return 16;
   if (0 == port)
+  {
+    const union MHD_DaemonInfo *dinfo;
+    dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
+    if ((NULL == dinfo) ||(0 == dinfo->port) )
     {
-      const union MHD_DaemonInfo *dinfo;
-      dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
-      if (NULL == dinfo || 0 == dinfo->port)
-        { MHD_stop_daemon (d); return 32; }
-      port = (int)dinfo->port;
+      MHD_stop_daemon (d); return 32;
     }
+    port = (int) dinfo->port;
+  }
   p = start_gets (port);
-  (void)sleep (1);
-  start_watchdog(10, "daemon_stop() in testMultithreadedGet");
+  (void) sleep (1);
+  start_watchdog (10, "daemon_stop() in testMultithreadedGet");
   MHD_stop_daemon (d);
-  stop_watchdog();
+  stop_watchdog ();
   continue_requesting = 0;
   pthread_join (p, NULL);
   return 0;
@@ -290,7 +296,8 @@ testMultithreadedPoolGet (int port,
   struct MHD_Daemon *d;
   pthread_t p;
 
-  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
+  d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
+                        | poll_flag,
                         port,
                         NULL, NULL,
                         &ahc_echo, "GET",
@@ -299,18 +306,20 @@ testMultithreadedPoolGet (int port,
   if (d == NULL)
     return 16;
   if (0 == port)
+  {
+    const union MHD_DaemonInfo *dinfo;
+    dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
+    if ((NULL == dinfo) ||(0 == dinfo->port) )
     {
-      const union MHD_DaemonInfo *dinfo;
-      dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
-      if (NULL == dinfo || 0 == dinfo->port)
-        { MHD_stop_daemon (d); return 32; }
-      port = (int)dinfo->port;
+      MHD_stop_daemon (d); return 32;
     }
+    port = (int) dinfo->port;
+  }
   p = start_gets (port);
-  (void)sleep (1);
-  start_watchdog(10, "daemon_stop() in testMultithreadedPoolGet");
+  (void) sleep (1);
+  start_watchdog (10, "daemon_stop() in testMultithreadedPoolGet");
   MHD_stop_daemon (d);
-  stop_watchdog();
+  stop_watchdog ();
   continue_requesting = 0;
   pthread_join (p, NULL);
   return 0;
@@ -322,8 +331,8 @@ main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
   int port;
-  (void)argc;   /* Unused. Silent compiler warning. */
-  (void)argv;   /* Unused. Silent compiler warning. */
+  (void) argc;   /* Unused. Silent compiler warning. */
+  (void) argv;   /* Unused. Silent compiler warning. */
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
     port = 0;
@@ -333,15 +342,16 @@ main (int argc, char *const *argv)
   /* Do reuse connection, otherwise all available local ports may exhausted. */
   oneone = 1;
 
-  if (0 != port && oneone)
+  if ((0 != port)&& oneone)
     port += 5;
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
   response = MHD_create_response_from_buffer (strlen ("/hello_world"),
-                                              "/hello_world",
-                                              MHD_RESPMEM_MUST_COPY);
+                                              "/hello_world",
+                                              MHD_RESPMEM_MUST_COPY);
   errorCount += testMultithreadedGet (port, 0);
-  if (0 != port) port++;
+  if (0 != port)
+    port++;
   errorCount += testMultithreadedPoolGet (port, 0);
   MHD_destroy_response (response);
   if (errorCount != 0)