[GNUnet-SVN] [libmicrohttpd] branch master updated (d951b950 -> 72576ec2)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from d951b950 tests: check whether MHD use SO_REUSEADDR by default
     new 00eb9247 Improve readability of previous commit 
d951b950ec1af5e6ba582a8a964dff2d9192ba41
     new 72576ec2 Muted additional compiler warnings

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/connection.c |  4 ++-
 src/microhttpd/daemon.c     |  8 +++++
 src/testcurl/test_get.c     | 72 +++++++++++++++++++--------------------------
 3 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index ef61fdb6..dd6e2733 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1036,7 +1036,9 @@ connection_close_error (struct MHD_Connection *connection,
   if (NULL != emsg)
     MHD_DLOG (connection->daemon,
               emsg);
-#endif
+#else  /* ! HAVE_MESSAGES */
+  (void)emsg; /* Mute compiler warning. */
+#endif /* ! HAVE_MESSAGES */
   MHD_connection_close_ (connection,
                          MHD_REQUEST_TERMINATED_WITH_ERROR);
 }
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index b1c7e88d..8005c01e 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -137,6 +137,10 @@ mhd_panic_std (void *cls,
           file,
            line,
            reason);
+#else  /* ! HAVE_MESSAGES */
+  (void)file;   /* Mute compiler warning. */
+  (void)line;   /* Mute compiler warning. */
+  (void)reason; /* Mute compiler warning. */
 #endif
   abort ();
 }
@@ -5071,6 +5075,10 @@ setup_epoll_fd (struct MHD_Daemon *daemon)
 {
   int fd;
 
+#ifndef HAVE_MESSAGES
+  (void)daemon; /* Mute compiler warning. */
+#endif /* ! HAVE_MESSAGES */
+
 #ifdef USE_EPOLL_CREATE1
   fd = epoll_create1 (EPOLL_CLOEXEC);
 #else  /* ! USE_EPOLL_CREATE1 */
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 4f4a0944..081859f7 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -119,14 +119,12 @@ testInternalGet (int poll_flag)
   struct CBC cbc;
   CURLcode errornum;
 
-  if (0 == global_port)
+  if ( (0 == global_port) &&
+       (MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) 
)
     {
-      if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-       {
-         global_port = 1220;
-         if (oneone)
-           global_port += 20;
-       }
+      global_port = 1220;
+      if (oneone)
+        global_port += 20;
     }
 
   cbc.buf = buf;
@@ -188,14 +186,12 @@ testMultithreadedGet (int poll_flag)
   struct CBC cbc;
   CURLcode errornum;
 
-  if (0 == global_port)
+  if ( (0 == global_port) &&
+       (MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) 
)
     {
-      if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-       {
-         global_port = 1221;
-         if (oneone)
-           global_port += 20;
-       }
+      global_port = 1221;
+      if (oneone)
+        global_port += 20;
     }
 
   cbc.buf = buf;
@@ -257,14 +253,12 @@ testMultithreadedPoolGet (int poll_flag)
   struct CBC cbc;
   CURLcode errornum;
 
-  if (0 == global_port)
+  if ( (0 == global_port) &&
+       (MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) 
)
     {
-      if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-       {
-         global_port = 1222;
-         if (oneone)
-           global_port += 20;
-       }
+      global_port = 1222;
+      if (oneone)
+        global_port += 20;
     }
 
   cbc.buf = buf;
@@ -341,14 +335,12 @@ testExternalGet ()
   time_t start;
   struct timeval tv;
 
-  if (0 == global_port)
+  if ( (0 == global_port) &&
+       (MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) 
)
     {
-      if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-       {
-         global_port = 1223;
-         if (oneone)
-           global_port += 20;
-       }
+      global_port = 1223;
+      if (oneone)
+        global_port += 20;
     }
 
   multi = NULL;
@@ -567,14 +559,12 @@ testStopRace (int poll_flag)
     MHD_socket fd;
     struct MHD_Daemon *d;
 
-    if (0 == global_port)
+    if ( (0 == global_port) &&
+         (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT)) )
       {
-       if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-         {
-           global_port = 1224;
-           if (oneone)
-             global_port += 20;
-         }
+        global_port = 1224;
+        if (oneone)
+          global_port += 20;
       }
 
     d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
@@ -682,14 +672,12 @@ testEmptyGet (int poll_flag)
   CURLcode errornum;
   int excess_found = 0;
 
-  if (0 == global_port)
+  if ( (0 == global_port) &&
+       (MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) 
)
     {
-      if (MHD_NO == MHD_is_feature_supported 
(MHD_FEATURE_AUTODETECT_BIND_PORT))
-       {
-         global_port = 1225;
-         if (oneone)
-           global_port += 20;
-       }
+      global_port = 1225;
+      if (oneone)
+        global_port += 20;
     }
 
   cbc.buf = buf;

-- 
To stop receiving notification emails like this one, please contact
address@hidden