mhd_str: refactored MHD_str_to_uint64() and MHD_str_to_uint64_n_() for simplification, more

error checking and optimization

3 files changed, 49 insertions, 83 deletions

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 10ac43bf..6e75ebd5 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2100,9 +2100,9 @@ parse_connection_headers (struct MHD_Connection *connection)
 					  MHD_HTTP_HEADER_CONTENT_LENGTH);
       if (NULL != clen)
         {
-          if (!MHD_str_to_uint64_ (clen, &connection->remaining_upload_size,
-                                   &end) ||
-              ('\0' != *end) )
+          end = clen + MHD_str_to_uint64_ (clen,
+                                           &connection->remaining_upload_size);
+          if ( (clen == end) || ('\0' != *end) )
             {
               connection->remaining_upload_size = 0;
 #ifdef HAVE_MESSAGES
diff --git a/src/microhttpd/mhd_str.c b/src/microhttpd/mhd_str.c
index 82b12311..7a8dbd93 100644
--- a/src/microhttpd/mhd_str.c
+++ b/src/microhttpd/mhd_str.c
@@ -237,47 +237,33 @@ MHD_str_equal_caseless_n_ (const char * const str1, const char * const str2, siz
  * Conversion stopped at first non-digit character.
  * @param str string to convert
  * @param out_val pointer to uint64_t to store result of conversion
- * @param next_char pointer to store pointer to character next to last
- *                  converted digit, ignored if NULL
- * @return non-zero if conversion succeed; zero if no digit is found,
- *         value is larger then possible to store in uint64_t or
- *         @a out_val or @a str is NULL
+ * @return non-zero number of characters processed on succeed,
+ *         zero if no digit is found, resulting value is larger
+ *         then possible to store in uint64_t or @a out_val is NULL
  */
-int 
-MHD_str_to_uint64_ (const char * str, uint64_t * out_val, const char ** next_char)
+size_t 
+MHD_str_to_uint64_ (const char * str, uint64_t * out_val)
 {
+  const char * const start = str;
   uint64_t res;
-  if (!str || !isasciidigit(str[0]))
-    {
-      if (next_char)
-        *next_char = str;
-      return 0;
-    }
+  if (!str || !out_val || !isasciidigit(str[0]))
+    return 0;
 
   res = 0;
   do
     {
-      const int digit = str[0] - '0';
-      if ( (res < (UINT64_MAX / 10)) ||
-           (res == (UINT64_MAX / 10) && digit <= (UINT64_MAX % 10)) )
-        {
-          res *= 10;
-          res += digit;
-        }
-      else
-        {
-          if (next_char)
-            *next_char = str;
-          return 0;
-        }
+      const int digit = (unsigned char)(*str) - '0';
+      if ( (res > (UINT64_MAX / 10)) ||
+           (res == (UINT64_MAX / 10) && digit > (UINT64_MAX % 10)) )
+        return 0;
+
+      res *= 10;
+      res += digit;
       str++;
-    } while (isasciidigit (str[0]));
+    } while (isasciidigit (*str));
 
   *out_val = res;
-  if (next_char)
-    *next_char = str;
-
-  return !0;
+  return str - start;
 }
 
 
@@ -287,49 +273,34 @@ MHD_str_to_uint64_ (const char * str, uint64_t * out_val, const char ** next_cha
  * Conversion stopped at first non-digit character or after @a maxlen 
  * digits.
  * @param str string to convert
+ * @param maxlen maximum number of characters to process
  * @param out_val pointer to uint64_t to store result of conversion
- * @param next_char pointer to store pointer to character next to last
- *                  converted digit, ignored if NULL
- * @return non-zero if conversion succeed; zero if no digit is found,
- *         value is larger then possible to store in uint64_t or
- *         @a out_val is NULL
+ * @return non-zero number of characters processed on succeed,
+ *         zero if no digit is found, resulting value is larger
+ *         then possible to store in uint64_t or @a out_val is NULL
  */
-int
-MHD_str_to_uint64_n_ (const char * str, size_t maxlen, uint64_t * out_val,
-                      const char ** next_char)
+size_t
+MHD_str_to_uint64_n_ (const char * str, size_t maxlen, uint64_t * out_val)
 {
   uint64_t res;
   size_t i;
-  if (!str || !maxlen || !isasciidigit (str[0]))
-    {
-      if (next_char)
-        *next_char = str;
-      return 0;
-    }
+  if (!str || !maxlen || !out_val || !isasciidigit (str[0]))
+    return 0;
 
   res = 0;
   i = 0;
   do
     {
-      const int digit = str[i] - '0';
-      if ( (res < (UINT64_MAX / 10)) ||
-           (res == (UINT64_MAX / 10) && digit <= (UINT64_MAX % 10)) )
-        {
-          res *= 10;
-          res += digit;
-        }
-      else
-        {
-          if (next_char)
-            *next_char = str + i;
-          return 0;
-        }
-      
-    } while(i < maxlen && isasciidigit(str[i]));
+      const int digit = (unsigned char)str[i] - '0';
+      if ( (res > (UINT64_MAX / 10)) ||
+           (res == (UINT64_MAX / 10) && digit > (UINT64_MAX % 10)) )
+        return 0;
 
-  *out_val = res;
-  if (next_char)
-    *next_char = str + i;
+      res *= 10;
+      res += digit;
+      i++;      
+    } while(i < maxlen && isasciidigit(str[i]));
 
-  return !0;
+  *out_val= res;
+  return i;
 }
diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index e14a308e..845e6389 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -65,16 +65,13 @@ MHD_str_equal_caseless_n_ (const char * const str1,
  * Conversion stopped at first non-digit character.
  * @param str string to convert
  * @param out_val pointer to uint64_t to store result of conversion
- * @param next_char pointer to store pointer to character next to last
- *                  converted digit, ignored if NULL
- * @return non-zero if conversion succeed; zero if no digit is found,
- *         value is larger then possible to store in uint64_t or
- *         @a out_val is NULL
+ * @return non-zero number of characters processed on succeed,
+ *         zero if no digit is found, resulting value is larger
+ *         then possible to store in uint64_t or @a out_val is NULL
  */
-int
+size_t
 MHD_str_to_uint64_ (const char * str,
-                    uint64_t * out_val,
-                    const char ** next_char);
+                    uint64_t * out_val);
 
 /**
  * Convert not more then @a maxlen decimal US-ASCII digits in string to
@@ -82,17 +79,15 @@ MHD_str_to_uint64_ (const char * str,
  * Conversion stopped at first non-digit character or after @a maxlen 
  * digits.
  * @param str string to convert
+ * @param maxlen maximum number of characters to process
  * @param out_val pointer to uint64_t to store result of conversion
- * @param next_char pointer to store pointer to character next to last
- *                  converted digit, ignored if NULL
- * @return non-zero if conversion succeed; zero if no digit is found,
- *         value is larger then possible to store in uint64_t or
- *         @a out_val is NULL
+ * @return non-zero number of characters processed on succeed,
+ *         zero if no digit is found, resulting value is larger
+ *         then possible to store in uint64_t or @a out_val is NULL
  */
-int
+size_t
 MHD_str_to_uint64_n_ (const char * str,
                       size_t maxlen,
-                      uint64_t * out_val,
-                      const char ** next_char);
+                      uint64_t * out_val);
 
 #endif /* MHD_STR_H */