[GNUnet-SVN] r24118 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2012-09-28 23:35:58 +0200 (Fri, 28 Sep 2012)
New Revision: 24118

Modified:
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/daemon.c
Log:
-fix type to ensure that comparisson will always work

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2012-09-28 19:15:52 UTC (rev 
24117)
+++ libmicrohttpd/src/daemon/connection.c       2012-09-28 21:35:58 UTC (rev 
24118)
@@ -364,7 +364,7 @@
 static int
 try_ready_normal_body (struct MHD_Connection *connection)
 {
-  int ret;
+  ssize_t ret;
   struct MHD_Response *response;
 
   response = connection->response;
@@ -433,7 +433,7 @@
 static int
 try_ready_chunked_body (struct MHD_Connection *connection)
 {
-  int ret;
+  ssize_t ret;
   char *buf;
   struct MHD_Response *response;
   size_t size;
@@ -508,7 +508,7 @@
     ret = 0xFFFFFF;
   snprintf (cbuf, 
            sizeof (cbuf),
-           "%X\r\n", ret);
+           "%X\r\n", (unsigned int) ret);
   cblen = strlen (cbuf);
   EXTRA_CHECK (cblen <= sizeof (cbuf));
   memcpy (&connection->write_buffer[sizeof (cbuf) - cblen], cbuf, cblen);

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2012-09-28 19:15:52 UTC (rev 24117)
+++ libmicrohttpd/src/daemon/daemon.c   2012-09-28 21:35:58 UTC (rev 24118)
@@ -1783,7 +1783,7 @@
           break;
         case MHD_OPTION_THREAD_POOL_SIZE:
           daemon->worker_pool_size = va_arg (ap, unsigned int);
-         if (daemon->worker_pool_size >= SIZE_MAX / sizeof (struct MHD_Daemon))
+         if (daemon->worker_pool_size >= (SIZE_MAX / sizeof (struct 
MHD_Daemon)))
            {
 #if HAVE_MESSAGES
              MHD_DLOG (daemon,