[libmicrohttpd] branch master updated (7131f387 -> 93a5a52a)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 7131f387 memorypool: minor code improvments
     new 317691bc mhd_str: minor improvement
     new 50b4782f mhd_str: clarified doxy for function
     new 93a5a52a mhd_str: fixed code style

The 3 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/mhd_str.c | 15 ++++++---------
 src/microhttpd/mhd_str.h |  6 +++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/microhttpd/mhd_str.c b/src/microhttpd/mhd_str.c
index 473ff466..31cc20b0 100644
--- a/src/microhttpd/mhd_str.c
+++ b/src/microhttpd/mhd_str.c
@@ -384,10 +384,7 @@ MHD_str_equal_caseless_ (const char *str1,
   {
     const char c1 = *str1;
     const char c2 = *str2;
-    if ( (c1 == c2) ||
-         (isasciiupper (c1) ?
-          ((c1 - 'A' + 'a') == c2) :
-          (isasciiupper (c2) && (c1 == (c2 - 'A' + 'a')))) )
+    if (charsequalcaseless (c1, c2))
     {
       str1++;
       str2++;
@@ -528,9 +525,9 @@ MHD_str_has_token_caseless_ (const char *str,
  * Remove case-insensitive @a token from the @a str and put result
  * to the output @a buf.
  *
- * Token could be surrounded by spaces and tabs and delimited by comma.
- * The token match succeed if substring between start, end (of string) or
- * comma contains only case-insensitive token and optional spaces and tabs.
+ * Tokens in @a str could be surrounded by spaces and tabs and delimited by
+ * comma. The token match succeed if substring between start, end (of string)
+ * or comma contains only case-insensitive token and optional spaces and tabs.
  * The quoted strings and comments are not supported by this function.
  *
  * The output string is normalised: empty tokens and repeated whitespaces
@@ -1181,9 +1178,9 @@ MHD_str_to_uvalue_n_ (const char *str,
   if (i)
   {
     if (8 == val_size)
-      *(uint64_t*) out_val = res;
+      *(uint64_t *) out_val = res;
     else if (4 == val_size)
-      *(uint32_t*) out_val = (uint32_t) res;
+      *(uint32_t *) out_val = (uint32_t) res;
     else
       return 0;
   }
diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index 43761e3a..3e5f8a41 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -156,9 +156,9 @@ MHD_str_has_token_caseless_ (const char *str,
  * Remove case-insensitive @a token from the @a str and put result
  * to the output @a buf.
  *
- * Token could be surrounded by spaces and tabs and delimited by comma.
- * The token match succeed if substring between start, end (of string) or
- * comma contains only case-insensitive token and optional spaces and tabs.
+ * Tokens in @a str could be surrounded by spaces and tabs and delimited by
+ * comma. The token match succeed if substring between start, end (of string)
+ * or comma contains only case-insensitive token and optional spaces and tabs.
  * The quoted strings and comments are not supported by this function.
  *
  * The output string is normalised: empty tokens and repeated whitespaces

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