[GNUnet-SVN] r36222 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2015-08-07 09:38:10 +0200 (Fri, 07 Aug 2015)
New Revision: 36222

Modified:
   libmicrohttpd/src/microhttpd/connection.c
Log:
connection.c: try_ready_chunked_body(): microoptimization, additional error 
checking

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-08-07 07:38:04 UTC (rev 
36221)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-08-07 07:38:10 UTC (rev 
36222)
@@ -406,7 +406,7 @@
   struct MHD_Response *response;
   size_t size;
   char cbuf[10];                /* 10: max strlen of "%x\r\n" */
-  size_t cblen;
+  int cblen;
 
   response = connection->response;
   if (0 == connection->write_buffer_size)
@@ -479,11 +479,11 @@
     }
   if (ret > 0xFFFFFF)
     ret = 0xFFFFFF;
-  MHD_snprintf_ (cbuf,
+  cblen = MHD_snprintf_(cbuf,
            sizeof (cbuf),
            "%X\r\n", (unsigned int) ret);
-  cblen = strlen (cbuf);
-  EXTRA_CHECK (cblen <= sizeof (cbuf));
+  EXTRA_CHECK(cblen > 0);
+  EXTRA_CHECK(cblen < sizeof(cbuf));
   memcpy (&connection->write_buffer[sizeof (cbuf) - cblen], cbuf, cblen);
   memcpy (&connection->write_buffer[sizeof (cbuf) + ret], "\r\n", 2);
   connection->response_write_position += ret;