1 files changed, 143 insertions, 142 deletions

diff --git a/src/microhttpd/test_shutdown_select.c b/src/microhttpd/test_shutdown_select.c
index a334f63f..ae88658d 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -50,7 +50,7 @@
 #if defined(MHD_WINSOCK_SOCKETS)
 #include <winsock2.h>
 #include <windows.h>
-#define sock_errno (WSAGetLastError())
+#define sock_errno (WSAGetLastError ())
 #elif defined(MHD_POSIX_SOCKETS)
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -83,7 +83,7 @@
 #define SOMAXCONN 511
 #endif /* ! SOMAXCONN */
 
-#if !defined(SHUT_RDWR) && defined(SD_BOTH)
+#if ! defined(SHUT_RDWR) && defined(SD_BOTH)
 #define SHUT_RDWR SD_BOTH
 #endif
 
@@ -91,34 +91,34 @@ static bool check_err;
 
 
 static bool
-has_in_name(const char *prog_name, const char *marker)
+has_in_name (const char *prog_name, const char *marker)
 {
   size_t name_pos;
   size_t pos;
 
-  if (!prog_name || !marker)
+  if (! prog_name || ! marker)
     return 0;
 
   pos = 0;
   name_pos = 0;
   while (prog_name[pos])
-    {
-      if ('/' == prog_name[pos])
-        name_pos = pos + 1;
+  {
+    if ('/' == prog_name[pos])
+      name_pos = pos + 1;
 #if defined(_WIN32) || defined(__CYGWIN__)
-      else if ('\\' == prog_name[pos])
-        name_pos = pos + 1;
+    else if ('\\' == prog_name[pos])
+      name_pos = pos + 1;
 #endif /* _WIN32 || __CYGWIN__ */
-      pos++;
-    }
+    pos++;
+  }
   if (name_pos == pos)
     return true;
-  return strstr(prog_name + name_pos, marker) != NULL;
+  return strstr (prog_name + name_pos, marker) != NULL;
 }
 
 
 static MHD_socket
-start_socket_listen(int domain)
+start_socket_listen (int domain)
 {
 /* Create sockets similarly to daemon.c */
   MHD_socket fd;
@@ -143,23 +143,23 @@ start_socket_listen(int domain)
   cloexec_set = 0;
 #endif /* !SOCK_CLOEXEC */
   if ( (MHD_INVALID_SOCKET == fd) && (cloexec_set) )
-    {
-      fd = socket (domain, SOCK_STREAM, 0);
-      cloexec_set = 0;
-    }
+  {
+    fd = socket (domain, SOCK_STREAM, 0);
+    cloexec_set = 0;
+  }
   if (MHD_INVALID_SOCKET == fd)
-    {
-      fprintf (stderr, "Can't create socket: %u\n",
-               (unsigned)sock_errno);
-      return MHD_INVALID_SOCKET;
-    }
-
-  if (!cloexec_set)
-    {
+  {
+    fprintf (stderr, "Can't create socket: %u\n",
+             (unsigned) sock_errno);
+    return MHD_INVALID_SOCKET;
+  }
+
+  if (! cloexec_set)
+  {
 #ifdef MHD_WINSOCK_SOCKETS
-    if (!SetHandleInformation ((HANDLE)fd, HANDLE_FLAG_INHERIT, 0))
+    if (! SetHandleInformation ((HANDLE) fd, HANDLE_FLAG_INHERIT, 0))
       fprintf (stderr, "Failed to make socket non-inheritable: %u\n",
-               (unsigned int)GetLastError ());
+               (unsigned int) GetLastError ());
 #else  /* MHD_POSIX_SOCKETS */
     flags = fcntl (fd, F_GETFD);
     if ( ( (-1 == flags) ||
@@ -168,7 +168,7 @@ start_socket_listen(int domain)
       fprintf (stderr, "Failed to make socket non-inheritable: %s\n",
                MHD_socket_last_strerr_ ());
 #endif /* MHD_POSIX_SOCKETS */
-    }
+  }
 
   memset (&sock_addr, 0, sizeof (struct sockaddr_in));
   sock_addr.sin_family = AF_INET;
@@ -179,73 +179,73 @@ start_socket_listen(int domain)
   addrlen = sizeof (struct sockaddr_in);
 
   if (bind (fd, (const struct sockaddr*) &sock_addr, addrlen) < 0)
-    {
-      fprintf (stderr, "Failed to bind socket: %u\n",
-               (unsigned)sock_errno);
-      MHD_socket_close_chk_ (fd);
-      return MHD_INVALID_SOCKET;
-    }
+  {
+    fprintf (stderr, "Failed to bind socket: %u\n",
+             (unsigned) sock_errno);
+    MHD_socket_close_chk_ (fd);
+    return MHD_INVALID_SOCKET;
+  }
 
 #ifdef MHD_WINSOCK_SOCKETS
   if (0 != ioctlsocket (fd, FIONBIO, &flags))
-    {
-      fprintf (stderr, "Failed to make socket non-blocking: %u\n",
-               (unsigned)sock_errno);
-      MHD_socket_close_chk_ (fd);
-      return MHD_INVALID_SOCKET;
-    }
+  {
+    fprintf (stderr, "Failed to make socket non-blocking: %u\n",
+             (unsigned) sock_errno);
+    MHD_socket_close_chk_ (fd);
+    return MHD_INVALID_SOCKET;
+  }
 #else  /* MHD_POSIX_SOCKETS */
   flags = fcntl (fd, F_GETFL);
   if ( ( (-1 == flags) ||
          ( (flags != (flags | O_NONBLOCK)) &&
            (0 != fcntl (fd, F_SETFL, flags | O_NONBLOCK)) ) ) )
-    {
-      fprintf (stderr, "Failed to make socket non-blocking: %s\n",
-              MHD_socket_last_strerr_ ());
-      MHD_socket_close_chk_ (fd);
-      return MHD_INVALID_SOCKET;
-    }
+  {
+    fprintf (stderr, "Failed to make socket non-blocking: %s\n",
+             MHD_socket_last_strerr_ ());
+    MHD_socket_close_chk_ (fd);
+    return MHD_INVALID_SOCKET;
+  }
 #endif /* MHD_POSIX_SOCKETS */
 
-  if (listen(fd, SOMAXCONN) < 0)
-    {
-      fprintf (stderr, "Failed to listen on socket: %u\n",
-               (unsigned)sock_errno);
-      MHD_socket_close_chk_ (fd);
-      return MHD_INVALID_SOCKET;
-    }
+  if (listen (fd, SOMAXCONN) < 0)
+  {
+    fprintf (stderr, "Failed to listen on socket: %u\n",
+             (unsigned) sock_errno);
+    MHD_socket_close_chk_ (fd);
+    return MHD_INVALID_SOCKET;
+  }
 
   return fd;
 }
 
 
 MHD_THRD_RTRN_TYPE_ MHD_THRD_CALL_SPEC_
-select_thread(void* data)
+select_thread (void*data)
 {
   /* use select() like in daemon.c */
-  MHD_socket listen_sock = *((MHD_socket*)data);
+  MHD_socket listen_sock = *((MHD_socket*) data);
   fd_set rs, ws;
   struct timeval timeout;
 
-  FD_ZERO(&rs);
-  FD_ZERO(&ws);
-  FD_SET(listen_sock, &rs);
+  FD_ZERO (&rs);
+  FD_ZERO (&ws);
+  FD_SET (listen_sock, &rs);
   timeout.tv_usec = 0;
   timeout.tv_sec = 7;
 
-  check_err = (0 > MHD_SYS_select_(listen_sock + 1, &rs, &ws, NULL, &timeout));
+  check_err = (0 > MHD_SYS_select_ (listen_sock + 1, &rs, &ws, NULL, &timeout));
 
-  return (MHD_THRD_RTRN_TYPE_)0;
+  return (MHD_THRD_RTRN_TYPE_) 0;
 }
 
 
 #ifdef HAVE_POLL
 MHD_THRD_RTRN_TYPE_ MHD_THRD_CALL_SPEC_
-poll_thread(void* data)
+poll_thread (void*data)
 {
   /* use poll() like in daemon.c */
   struct pollfd p[1];
-  MHD_socket listen_sock = *((MHD_socket*)data);
+  MHD_socket listen_sock = *((MHD_socket*) data);
 
   p[0].fd = listen_sock;
   p[0].events = POLLIN;
@@ -253,22 +253,22 @@ poll_thread(void* data)
 
   check_err = (0 > MHD_sys_poll_ (p, 1, 7000));
 
-  return (MHD_THRD_RTRN_TYPE_)0;
+  return (MHD_THRD_RTRN_TYPE_) 0;
 }
 #endif /* HAVE_POLL */
 
 
 static void
-local_sleep(unsigned seconds)
+local_sleep (unsigned seconds)
 {
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  Sleep(seconds * 1000);
+#if defined(_WIN32) && ! defined(__CYGWIN__)
+  Sleep (seconds * 1000);
 #else
   unsigned seconds_left = seconds;
   do
-    {
-      seconds_left = sleep(seconds_left);
-    } while (seconds_left > 0);
+  {
+    seconds_left = sleep (seconds_left);
+  } while (seconds_left > 0);
 #endif
 }
 
@@ -279,7 +279,7 @@ main (int argc, char *const *argv)
   int i;
   time_t start_t, end_t;
   int result = 0;
-  MHD_THRD_RTRN_TYPE_ (MHD_THRD_CALL_SPEC_ *test_func)(void* data);
+  MHD_THRD_RTRN_TYPE_ (MHD_THRD_CALL_SPEC_ * test_func)(void*data);
 #ifdef MHD_WINSOCK_SOCKETS
   WORD ver_req;
   WSADATA wsa_data;
@@ -287,101 +287,102 @@ main (int argc, char *const *argv)
 #endif /* MHD_WINSOCK_SOCKETS */
   bool test_poll;
   bool must_ignore;
-  (void)argc; /* Unused. Silent compiler warning. */
+  (void) argc; /* Unused. Silent compiler warning. */
 
-  test_poll = has_in_name(argv[0], "_poll");
-  must_ignore = has_in_name(argv[0], "_ignore");
+  test_poll = has_in_name (argv[0], "_poll");
+  must_ignore = has_in_name (argv[0], "_ignore");
   if (! test_poll)
     test_func = &select_thread;
   else
-    {
+  {
 #ifndef HAVE_POLL
-      return 77;
+    return 77;
 #else  /* ! HAVE_POLL */
-      test_func = &poll_thread;
+    test_func = &poll_thread;
 #endif /* ! HAVE_POLL */
-    }
+  }
 
 #ifdef MHD_WINSOCK_SOCKETS
-  ver_req = MAKEWORD(2, 2);
-
-  err = WSAStartup(ver_req, &wsa_data);
-  if (err != 0 || MAKEWORD(2, 2) != wsa_data.wVersion)
-    {
-      printf("WSAStartup() failed\n");
-      WSACleanup();
-      return 99;
-    }
+  ver_req = MAKEWORD (2, 2);
+
+  err = WSAStartup (ver_req, &wsa_data);
+  if ((err != 0)||(MAKEWORD (2, 2) != wsa_data.wVersion))
+  {
+    printf ("WSAStartup() failed\n");
+    WSACleanup ();
+    return 99;
+  }
 #endif /* MHD_WINSOCK_SOCKETS */
 
   /* try several times to ensure that accidental incoming connection
    * didn't interfere with test results
    */
   for (i = 0; i < 5 && result == 0; i++)
-    {
-      MHD_thread_handle_ sel_thrd;
-      /* fprintf(stdout, "Creating, binding and listening socket...\n"); */
-      MHD_socket listen_socket = start_socket_listen (AF_INET);
-      if (MHD_INVALID_SOCKET == listen_socket)
-        return 99;
-
-      check_err = true;
-      /* fprintf (stdout, "Starting select() thread...\n"); */
+  {
+    MHD_thread_handle_ sel_thrd;
+    /* fprintf(stdout, "Creating, binding and listening socket...\n"); */
+    MHD_socket listen_socket = start_socket_listen (AF_INET);
+    if (MHD_INVALID_SOCKET == listen_socket)
+      return 99;
+
+    check_err = true;
+    /* fprintf (stdout, "Starting select() thread...\n"); */
 #if defined(MHD_USE_POSIX_THREADS)
-      if (0 != pthread_create (&sel_thrd, NULL, test_func, &listen_socket))
-        {
-          MHD_socket_close_chk_ (listen_socket);
-          fprintf (stderr, "Can't start thread\n");
-          return 99;
-        }
+    if (0 != pthread_create (&sel_thrd, NULL, test_func, &listen_socket))
+    {
+      MHD_socket_close_chk_ (listen_socket);
+      fprintf (stderr, "Can't start thread\n");
+      return 99;
+    }
 #elif defined(MHD_USE_W32_THREADS)
-      sel_thrd = (HANDLE)_beginthreadex (NULL, 0, test_func, &listen_socket, 0, NULL);
-      if (0 == (sel_thrd))
-        {
-          MHD_socket_close_chk_ (listen_socket);
-          fprintf (stderr, "Can't start select() thread\n");
-          return 99;
-        }
+    sel_thrd = (HANDLE) _beginthreadex (NULL, 0, test_func, &listen_socket, 0,
+                                        NULL);
+    if (0 == (sel_thrd))
+    {
+      MHD_socket_close_chk_ (listen_socket);
+      fprintf (stderr, "Can't start select() thread\n");
+      return 99;
+    }
 #else
 #error No threading lib available
 #endif
-      /* fprintf (stdout, "Waiting...\n"); */
-      local_sleep(1); /* make sure that select() is started */
-
-      /* fprintf (stdout, "Shutting down socket...\n"); */
-      start_t = time (NULL);
-      shutdown (listen_socket, SHUT_RDWR);
-
-      /* fprintf (stdout, "Waiting for thread to finish...\n"); */
-      if (!MHD_join_thread_(sel_thrd))
-        {
-          MHD_socket_close_chk_(listen_socket);
-          fprintf (stderr, "Can't join select() thread\n");
-          return 99;
-        }
-      if (check_err)
-        {
-          MHD_socket_close_chk_(listen_socket);
-          fprintf (stderr, "Error in waiting thread\n");
-          return 99;
-        }
-      end_t = time (NULL);
-      /* fprintf (stdout, "Thread finished.\n"); */
-      MHD_socket_close_chk_(listen_socket);
-
-      if (start_t == (time_t)-1 || end_t == (time_t)-1)
-        {
-          MHD_socket_close_chk_(listen_socket);
-          fprintf (stderr, "Can't get current time\n");
-          return 99;
-        }
-      if (end_t - start_t > 3)
-        result++;
+    /* fprintf (stdout, "Waiting...\n"); */
+    local_sleep (1);  /* make sure that select() is started */
+
+    /* fprintf (stdout, "Shutting down socket...\n"); */
+    start_t = time (NULL);
+    shutdown (listen_socket, SHUT_RDWR);
+
+    /* fprintf (stdout, "Waiting for thread to finish...\n"); */
+    if (! MHD_join_thread_ (sel_thrd))
+    {
+      MHD_socket_close_chk_ (listen_socket);
+      fprintf (stderr, "Can't join select() thread\n");
+      return 99;
+    }
+    if (check_err)
+    {
+      MHD_socket_close_chk_ (listen_socket);
+      fprintf (stderr, "Error in waiting thread\n");
+      return 99;
+    }
+    end_t = time (NULL);
+    /* fprintf (stdout, "Thread finished.\n"); */
+    MHD_socket_close_chk_ (listen_socket);
+
+    if ((start_t == (time_t) -1) ||(end_t == (time_t) -1) )
+    {
+      MHD_socket_close_chk_ (listen_socket);
+      fprintf (stderr, "Can't get current time\n");
+      return 99;
     }
+    if (end_t - start_t > 3)
+      result++;
+  }
 
 #ifdef MHD_WINSOCK_SOCKETS
-  WSACleanup();
+  WSACleanup ();
 #endif /* MHD_WINSOCK_SOCKETS */
 
-  return must_ignore ? (!result) : (result);
+  return must_ignore ? (! result) : (result);
 }