formatting and versioning

1 files changed, 197 insertions, 273 deletions

diff --git a/src/daemon/daemontest_get.c b/src/daemon/daemontest_get.c
index 08de296d..f200a4c8 100644
--- a/src/daemon/daemontest_get.c
+++ b/src/daemon/daemontest_get.c
@@ -35,210 +35,167 @@
 
 static int oneone;
 
-struct CBC {
-  char * buf;
+struct CBC
+{
+  char *buf;
   size_t pos;
   size_t size;
 };
 
-static size_t copyBuffer(void * ptr,
-                         size_t size,
-                         size_t nmemb,
-                         void * ctx) {
-  struct CBC * cbc = ctx;
+static size_t
+copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+{
+  struct CBC *cbc = ctx;
 
   if (cbc->pos + size * nmemb > cbc->size)
-    return 0; /* overflow */
-  memcpy(&cbc->buf[cbc->pos],
-         ptr,
-         size * nmemb);
+    return 0;                   /* overflow */
+  memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
   cbc->pos += size * nmemb;
   return size * nmemb;
 }
 
-static int ahc_echo(void * cls,
-                    struct MHD_Connection * connection,
-                    const char * url,
-                    const char * method,
-                    const char * version,
-                    const char * upload_data,
-                    unsigned int * upload_data_size) {
-  const char * me = cls;
-  struct MHD_Response * response;
+static int
+ahc_echo (void *cls,
+          struct MHD_Connection *connection,
+          const char *url,
+          const char *method,
+          const char *version,
+          const char *upload_data, unsigned int *upload_data_size)
+{
+  const char *me = cls;
+  struct MHD_Response *response;
   int ret;
 
-  if (0 != strcmp(me, method))
-    return MHD_NO; /* unexpected method */
-  response = MHD_create_response_from_data(strlen(url),
-                                           (void*) url,
-                                           MHD_NO,
-                                           MHD_YES);
-  ret = MHD_queue_response(connection,
-                           MHD_HTTP_OK,
-                           response);
-  MHD_destroy_response(response);
+  if (0 != strcmp (me, method))
+    return MHD_NO;              /* unexpected method */
+  response = MHD_create_response_from_data (strlen (url),
+                                            (void *) url, MHD_NO, MHD_YES);
+  ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+  MHD_destroy_response (response);
   return ret;
 }
 
 
-static int testInternalGet() {
-  struct MHD_Daemon * d;
-  CURL * c;
+static int
+testInternalGet ()
+{
+  struct MHD_Daemon *d;
+  CURL *c;
   char buf[2048];
   struct CBC cbc;
 
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
-                       1080,
-                       NULL,
-                       NULL,
-                       &ahc_echo,
-                       "GET",
-                       MHD_OPTION_END);
+  d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
+                        1080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
   if (d == NULL)
     return 1;
-  c = curl_easy_init();
-  curl_easy_setopt(c,
-                   CURLOPT_URL,
-                   "http://localhost:1080/hello_world");
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEFUNCTION,
-                   &copyBuffer);
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEDATA,
-                   &cbc);
-  curl_easy_setopt(c,
-                   CURLOPT_FAILONERROR,
-                   1);
-  curl_easy_setopt(c,
-                   CURLOPT_TIMEOUT,
-                   2L);
-  curl_easy_setopt(c,
-                   CURLOPT_CONNECTTIMEOUT,
-                   2L);
+  c = curl_easy_init ();
+  curl_easy_setopt (c, CURLOPT_URL, "http://localhost:1080/hello_world");
+  curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
+  curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
+  curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
+  curl_easy_setopt (c, CURLOPT_TIMEOUT, 2L);
+  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 2L);
   if (oneone)
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_1);
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
   else
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_0);
-   // NOTE: use of CONNECTTIMEOUT without also
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+  // NOTE: use of CONNECTTIMEOUT without also
   //   setting NOSIGNAL results in really weird
   //   crashes on my system!
-  curl_easy_setopt(c,
-                   CURLOPT_NOSIGNAL,
-                   1);
-  if (CURLE_OK != curl_easy_perform(c)) {
-    curl_easy_cleanup(c);
-    MHD_stop_daemon(d);
-    return 2;
-  }
-  curl_easy_cleanup(c);
-  if (cbc.pos != strlen("/hello_world")) {
-    MHD_stop_daemon(d);
-    return 4;
-  }
+  curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
+  if (CURLE_OK != curl_easy_perform (c))
+    {
+      curl_easy_cleanup (c);
+      MHD_stop_daemon (d);
+      return 2;
+    }
+  curl_easy_cleanup (c);
+  if (cbc.pos != strlen ("/hello_world"))
+    {
+      MHD_stop_daemon (d);
+      return 4;
+    }
 
-  if (0 != strncmp("/hello_world",
-                   cbc.buf,
-                   strlen("/hello_world"))) {
-    MHD_stop_daemon(d);
-    return 8;
-  }
-  MHD_stop_daemon(d);
+  if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
+    {
+      MHD_stop_daemon (d);
+      return 8;
+    }
+  MHD_stop_daemon (d);
 
   return 0;
 }
 
-static int testMultithreadedGet() {
-  struct MHD_Daemon * d;
-  CURL * c;
+static int
+testMultithreadedGet ()
+{
+  struct MHD_Daemon *d;
+  CURL *c;
   char buf[2048];
   struct CBC cbc;
 
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
-                       1081,
-                       NULL,
-                       NULL,
-                       &ahc_echo,
-                       "GET",
-                       MHD_OPTION_END);
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+                        1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
   if (d == NULL)
     return 16;
-  c = curl_easy_init();
-  curl_easy_setopt(c,
-                   CURLOPT_URL,
-                   "http://localhost:1081/hello_world");
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEFUNCTION,
-                   &copyBuffer);
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEDATA,
-                   &cbc);
-  curl_easy_setopt(c,
-                   CURLOPT_FAILONERROR,
-                   1);
-  curl_easy_setopt(c,
-                   CURLOPT_TIMEOUT,
-                   2L);
+  c = curl_easy_init ();
+  curl_easy_setopt (c, CURLOPT_URL, "http://localhost:1081/hello_world");
+  curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
+  curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
+  curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
+  curl_easy_setopt (c, CURLOPT_TIMEOUT, 2L);
   if (oneone)
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_1);
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
   else
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_0);
-   curl_easy_setopt(c,
-                   CURLOPT_CONNECTTIMEOUT,
-                   2L);
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 2L);
   // NOTE: use of CONNECTTIMEOUT without also
   //   setting NOSIGNAL results in really weird
   //   crashes on my system!
-  curl_easy_setopt(c,
-                   CURLOPT_NOSIGNAL,
-                   1);
-  if (CURLE_OK != curl_easy_perform(c)) {
-    MHD_stop_daemon(d);
-    return 32;
-  }
-  curl_easy_cleanup(c);
-  if (cbc.pos != strlen("/hello_world")) {
-    MHD_stop_daemon(d);
-    return 64;
-  }
-  if (0 != strncmp("/hello_world",
-                   cbc.buf,
-                   strlen("/hello_world"))) {
-    MHD_stop_daemon(d);
-    return 128;
-  }
-  MHD_stop_daemon(d);
+  curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
+  if (CURLE_OK != curl_easy_perform (c))
+    {
+      MHD_stop_daemon (d);
+      return 32;
+    }
+  curl_easy_cleanup (c);
+  if (cbc.pos != strlen ("/hello_world"))
+    {
+      MHD_stop_daemon (d);
+      return 64;
+    }
+  if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
+    {
+      MHD_stop_daemon (d);
+      return 128;
+    }
+  MHD_stop_daemon (d);
 
   return 0;
 }
 
 
-static int testExternalGet() {
-  struct MHD_Daemon * d;
-  CURL * c;
+static int
+testExternalGet ()
+{
+  struct MHD_Daemon *d;
+  CURL *c;
   char buf[2048];
   struct CBC cbc;
-  CURLM * multi;
+  CURLM *multi;
   CURLMcode mret;
   fd_set rs;
   fd_set ws;
   fd_set es;
   int max;
   int running;
-  struct CURLMsg * msg;
+  struct CURLMsg *msg;
   time_t start;
   struct timeval tv;
 
@@ -246,154 +203,121 @@ static int testExternalGet() {
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_DEBUG,
-                       1082,
-                       NULL,
-                       NULL,
-                       &ahc_echo,
-                       "GET",
-                       MHD_OPTION_END);
+  d = MHD_start_daemon (MHD_USE_DEBUG,
+                        1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
   if (d == NULL)
     return 256;
-  c = curl_easy_init();
-  curl_easy_setopt(c,
-                   CURLOPT_URL,
-                   "http://localhost:1082/hello_world");
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEFUNCTION,
-                   &copyBuffer);
-  curl_easy_setopt(c,
-                   CURLOPT_WRITEDATA,
-                   &cbc);
-  curl_easy_setopt(c,
-                   CURLOPT_FAILONERROR,
-                   1);
+  c = curl_easy_init ();
+  curl_easy_setopt (c, CURLOPT_URL, "http://localhost:1082/hello_world");
+  curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
+  curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
+  curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
   if (oneone)
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_1);
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
   else
-    curl_easy_setopt(c,
-                     CURLOPT_HTTP_VERSION,
-                     CURL_HTTP_VERSION_1_0);
-   curl_easy_setopt(c,
-                   CURLOPT_TIMEOUT,
-                   5L);
-  curl_easy_setopt(c,
-                   CURLOPT_CONNECTTIMEOUT,
-                   5L);
+    curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+  curl_easy_setopt (c, CURLOPT_TIMEOUT, 5L);
+  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 5L);
   // NOTE: use of CONNECTTIMEOUT without also
   //   setting NOSIGNAL results in really weird
   //   crashes on my system!
-  curl_easy_setopt(c,
-                   CURLOPT_NOSIGNAL,
-                   1);
+  curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
 
 
-  multi = curl_multi_init();
-  if (multi == NULL) {
-    curl_easy_cleanup(c);
-    MHD_stop_daemon(d);
-    return 512;
-  }
-  mret = curl_multi_add_handle(multi, c);
-  if (mret != CURLM_OK) {
-    curl_multi_cleanup(multi);
-    curl_easy_cleanup(c);
-    MHD_stop_daemon(d);
-    return 1024;
-  }
-  start = time(NULL);
-  while ( (time(NULL) - start < 5) &&
-          (multi != NULL) ) {
-    max = 0;
-    FD_ZERO(&rs);
-    FD_ZERO(&ws);
-    FD_ZERO(&es);
-    curl_multi_perform(multi, &running);
-    mret = curl_multi_fdset(multi,
-                            &rs,
-                            &ws,
-                            &es,
-                            &max);
-    if (mret != CURLM_OK) {
-      curl_multi_remove_handle(multi, c);
-      curl_multi_cleanup(multi);
-      curl_easy_cleanup(c);
-      MHD_stop_daemon(d);
-      return 2048;
+  multi = curl_multi_init ();
+  if (multi == NULL)
+    {
+      curl_easy_cleanup (c);
+      MHD_stop_daemon (d);
+      return 512;
+    }
+  mret = curl_multi_add_handle (multi, c);
+  if (mret != CURLM_OK)
+    {
+      curl_multi_cleanup (multi);
+      curl_easy_cleanup (c);
+      MHD_stop_daemon (d);
+      return 1024;
+    }
+  start = time (NULL);
+  while ((time (NULL) - start < 5) && (multi != NULL))
+    {
+      max = 0;
+      FD_ZERO (&rs);
+      FD_ZERO (&ws);
+      FD_ZERO (&es);
+      curl_multi_perform (multi, &running);
+      mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+      if (mret != CURLM_OK)
+        {
+          curl_multi_remove_handle (multi, c);
+          curl_multi_cleanup (multi);
+          curl_easy_cleanup (c);
+          MHD_stop_daemon (d);
+          return 2048;
+        }
+      if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+        {
+          curl_multi_remove_handle (multi, c);
+          curl_multi_cleanup (multi);
+          curl_easy_cleanup (c);
+          MHD_stop_daemon (d);
+          return 4096;
+        }
+      tv.tv_sec = 0;
+      tv.tv_usec = 1000;
+      select (max + 1, &rs, &ws, &es, &tv);
+      curl_multi_perform (multi, &running);
+      if (running == 0)
+        {
+          msg = curl_multi_info_read (multi, &running);
+          if (msg == NULL)
+            break;
+          if (msg->msg == CURLMSG_DONE)
+            {
+              if (msg->data.result != CURLE_OK)
+                printf ("%s failed at %s:%d: `%s'\n",
+                        "curl_multi_perform",
+                        __FILE__,
+                        __LINE__, curl_easy_strerror (msg->data.result));
+              curl_multi_remove_handle (multi, c);
+              curl_multi_cleanup (multi);
+              curl_easy_cleanup (c);
+              c = NULL;
+              multi = NULL;
+            }
+        }
+      MHD_run (d);
     }
-    if (MHD_YES != MHD_get_fdset(d,
-                                 &rs,
-                                 &ws,
-                                 &es,
-                                 &max)) {
-      curl_multi_remove_handle(multi, c);
-      curl_multi_cleanup(multi);
-      curl_easy_cleanup(c);
-      MHD_stop_daemon(d);
-      return 4096;
+  if (multi != NULL)
+    {
+      curl_multi_remove_handle (multi, c);
+      curl_easy_cleanup (c);
+      curl_multi_cleanup (multi);
     }
-    tv.tv_sec = 0;
-    tv.tv_usec = 1000;
-    select(max + 1,
-           &rs,
-           &ws,
-           &es,
-           &tv);
-    curl_multi_perform(multi, &running);
-    if (running == 0) {
-      msg = curl_multi_info_read(multi,
-                                 &running);
-      if (msg == NULL)
-        break;
-      if (msg->msg == CURLMSG_DONE) {
-        if (msg->data.result != CURLE_OK)
-          printf("%s failed at %s:%d: `%s'\n",
-                 "curl_multi_perform",
-                 __FILE__,
-                 __LINE__,
-                 curl_easy_strerror(msg->data.result));
-        curl_multi_remove_handle(multi, c);
-        curl_multi_cleanup(multi);
-        curl_easy_cleanup(c);
-        c = NULL;
-        multi = NULL;
-      }
-    }   
-    MHD_run(d);
-  }
-  if (multi != NULL) {
-    curl_multi_remove_handle(multi, c);
-    curl_easy_cleanup(c);
-    curl_multi_cleanup(multi);
-  }
-  MHD_stop_daemon(d);
-  if (cbc.pos != strlen("/hello_world"))
+  MHD_stop_daemon (d);
+  if (cbc.pos != strlen ("/hello_world"))
     return 8192;
-  if (0 != strncmp("/hello_world",
-                   cbc.buf,
-                   strlen("/hello_world")))
+  if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
     return 16384;
   return 0;
 }
 
 
 
-int main(int argc,
-         char * const * argv) {
+int
+main (int argc, char *const *argv)
+{
   unsigned int errorCount = 0;
 
-  oneone = NULL != strstr(argv[0], "11");
-  if (0 != curl_global_init(CURL_GLOBAL_WIN32))
+  oneone = NULL != strstr (argv[0], "11");
+  if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
-  errorCount += testInternalGet();
-  errorCount += testMultithreadedGet();
-  errorCount += testExternalGet();
+  errorCount += testInternalGet ();
+  errorCount += testMultithreadedGet ();
+  errorCount += testExternalGet ();
   if (errorCount != 0)
-    fprintf(stderr,
-            "Error (code: %u)\n",
-            errorCount);
-  curl_global_cleanup();
-  return errorCount != 0; /* 0 == pass */
+    fprintf (stderr, "Error (code: %u)\n", errorCount);
+  curl_global_cleanup ();
+  return errorCount != 0;       /* 0 == pass */
 }