[libmicrohttpd] branch master updated (a120d270 -> c1115185)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from a120d270 mhd_send.c: renamed function, moved doxy
     new ef091c94 mhd_send.c: fixed warnings
     new c1115185 Muted some 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/daemon.c     | 1 +
 src/microhttpd/digestauth.c | 4 ++++
 src/microhttpd/mhd_send.c   | 5 ++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 46cfad0e..5666e4ee 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2959,6 +2959,7 @@ new_connections_list_process_ (struct MHD_Daemon *daemon)
   daemon->new_connections_tail = NULL;
   daemon->have_new = false;
   MHD_mutex_unlock_chk_ (&daemon->new_connections_mutex);
+  (void) local_head; /* Mute compiler warning */
 
   /* Process new connections in FIFO order. */
   do
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 0c86c58e..3ab1ec13 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -31,6 +31,7 @@
 #include "mhd_mono_clock.h"
 #include "mhd_str.h"
 #include "mhd_compat.h"
+#include "mhd_assert.h"
 
 #if defined(MHD_W32_MUTEX_)
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1214,6 +1215,9 @@ MHD_digest_auth_check (struct MHD_Connection *connection,
       da.update = &MHD_SHA256_update;                         \
       da.digest = &sha256_finish;                         \
       break;                                              \
+    default:                                              \
+      mhd_assert (false);                                 \
+      break;                                              \
     }                                                     \
   } while (0)
 
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 246e6c96..11de6a19 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -235,7 +235,6 @@ pre_send_setopt (struct MHD_Connection *connection,
                  bool plain_send,
                  bool push_data)
 {
-  int ret;
   /* Try to buffer data if not sending the final piece.
    * Final piece is indicated by push_data == true. */
   const bool buffer_data = (! push_data);
@@ -495,7 +494,6 @@ post_send_setopt (struct MHD_Connection *connection,
                   bool plain_send_next,
                   bool push_data)
 {
-  int ret;
   /* Try to buffer data if not sending the final piece.
    * Final piece is indicated by push_data == true. */
   const bool buffer_data = (! push_data);
@@ -855,7 +853,8 @@ MHD_send_hdr_and_body_ (struct MHD_Connection *connection,
                           header,
                           header_size,
                           push_hdr);
-    if ( ((size_t) header_size == ret) &&
+
+    if ( (header_size == (size_t) ret) &&
          (((size_t) SSIZE_MAX > header_size)) &&
          (0 != body_size) )
     {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.