1 files changed, 59 insertions, 50 deletions

diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index 5c0e0fdc..dd379f52 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -42,7 +42,7 @@
 /**
  * Determine length of static string / macro strings at compile time.
  */
-#define MHD_STATICSTR_LEN_(macro) (sizeof(macro)/sizeof(char) - 1)
+#define MHD_STATICSTR_LEN_(macro) (sizeof(macro) / sizeof(char) - 1)
 #endif /* ! MHD_STATICSTR_LEN_ */
 
 /*
@@ -58,11 +58,12 @@
  * @return non-zero if two strings are equal, zero otherwise.
  */
 int
-MHD_str_equal_caseless_ (const char * str1,
-                 const char * str2);
+MHD_str_equal_caseless_ (const char *str1,
+                         const char *str2);
 #else  /* MHD_FAVOR_SMALL_CODE */
 /* Reuse MHD_str_equal_caseless_n_() to reduce size */
-#define MHD_str_equal_caseless_(s1,s2) MHD_str_equal_caseless_n_((s1),(s2), SIZE_MAX)
+#define MHD_str_equal_caseless_(s1,s2) MHD_str_equal_caseless_n_ ((s1),(s2), \
+                                                                  SIZE_MAX)
 #endif /* MHD_FAVOR_SMALL_CODE */
 
 
@@ -77,9 +78,9 @@ MHD_str_equal_caseless_ (const char * str1,
  * @return non-zero if two strings are equal, zero otherwise.
  */
 int
-MHD_str_equal_caseless_n_ (const char * const str1,
-                  const char * const str2,
-                  size_t maxlen);
+MHD_str_equal_caseless_n_ (const char *const str1,
+                           const char *const str2,
+                           size_t maxlen);
 
 
 /**
@@ -92,9 +93,9 @@ MHD_str_equal_caseless_n_ (const char * const str1,
  * @return non-zero if two strings are equal, zero otherwise.
  */
 bool
-MHD_str_equal_caseless_bin_n_ (const char * const str1,
-                  const char * const str2,
-                  size_t len);
+MHD_str_equal_caseless_bin_n_ (const char *const str1,
+                               const char *const str2,
+                               size_t len);
 
 
 /**
@@ -111,8 +112,8 @@ MHD_str_equal_caseless_bin_n_ (const char * const str1,
  * @return non-zero if two strings are equal, zero otherwise.
  */
 bool
-MHD_str_has_token_caseless_ (const char * str,
-                             const char * const token,
+MHD_str_has_token_caseless_ (const char *str,
+                             const char *const token,
                              size_t token_len);
 
 /**
@@ -126,7 +127,7 @@ MHD_str_has_token_caseless_ (const char * str,
  * @return non-zero if two strings are equal, zero otherwise.
  */
 #define MHD_str_has_s_token_caseless_(str,tkn) \
-    MHD_str_has_token_caseless_((str),(tkn),MHD_STATICSTR_LEN_(tkn))
+  MHD_str_has_token_caseless_ ((str),(tkn),MHD_STATICSTR_LEN_ (tkn))
 
 #ifndef MHD_FAVOR_SMALL_CODE
 /* Use individual function for each case to improve speed */
@@ -141,13 +142,13 @@ MHD_str_has_token_caseless_ (const char * str,
  *         then possible to store in uint64_t or @a out_val is NULL
  */
 size_t
-MHD_str_to_uint64_ (const char * str,
-                    uint64_t * out_val);
+MHD_str_to_uint64_ (const char *str,
+                    uint64_t *out_val);
 
 /**
  * Convert not more then @a maxlen decimal US-ASCII digits in string to
  * number in uint64_t.
- * Conversion stopped at first non-digit character or after @a maxlen 
+ * 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
@@ -157,9 +158,9 @@ MHD_str_to_uint64_ (const char * str,
  *         then possible to store in uint64_t or @a out_val is NULL
  */
 size_t
-MHD_str_to_uint64_n_ (const char * str,
+MHD_str_to_uint64_n_ (const char *str,
                       size_t maxlen,
-                      uint64_t * out_val);
+                      uint64_t *out_val);
 
 
 /**
@@ -167,19 +168,19 @@ MHD_str_to_uint64_n_ (const char * str,
  * Conversion stopped at first non-digit character.
  * @param str string to convert
  * @param out_val pointer to uint32_t to store result of conversion
- * @return non-zero number of characters processed on succeed, 
+ * @return non-zero number of characters processed on succeed,
  *         zero if no digit is found, resulting value is larger
  *         then possible to store in uint32_t or @a out_val is NULL
  */
 size_t
-MHD_strx_to_uint32_ (const char * str,
-                     uint32_t * out_val);
+MHD_strx_to_uint32_ (const char *str,
+                     uint32_t *out_val);
 
 
 /**
  * Convert not more then @a maxlen hexadecimal US-ASCII digits in string
  * to number in uint32_t.
- * Conversion stopped at first non-digit character or after @a maxlen 
+ * 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
@@ -189,9 +190,9 @@ MHD_strx_to_uint32_ (const char * str,
  *         then possible to store in uint32_t or @a out_val is NULL
  */
 size_t
-MHD_strx_to_uint32_n_ (const char * str,
-                      size_t maxlen,
-                      uint32_t * out_val);
+MHD_strx_to_uint32_n_ (const char *str,
+                       size_t maxlen,
+                       uint32_t *out_val);
 
 
 /**
@@ -199,19 +200,19 @@ MHD_strx_to_uint32_n_ (const char * str,
  * Conversion stopped at first non-digit character.
  * @param str string to convert
  * @param out_val pointer to uint64_t to store result of conversion
- * @return non-zero number of characters processed on succeed, 
+ * @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
  */
 size_t
-MHD_strx_to_uint64_ (const char * str,
-                     uint64_t * out_val);
+MHD_strx_to_uint64_ (const char *str,
+                     uint64_t *out_val);
 
 
 /**
  * Convert not more then @a maxlen hexadecimal US-ASCII digits in string
  * to number in uint64_t.
- * Conversion stopped at first non-digit character or after @a maxlen 
+ * 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
@@ -221,9 +222,9 @@ MHD_strx_to_uint64_ (const char * str,
  *         then possible to store in uint64_t or @a out_val is NULL
  */
 size_t
-MHD_strx_to_uint64_n_ (const char * str,
+MHD_strx_to_uint64_n_ (const char *str,
                        size_t maxlen,
-                       uint64_t * out_val);
+                       uint64_t *out_val);
 
 #else  /* MHD_FAVOR_SMALL_CODE */
 /* Use one universal function and macros to reduce size */
@@ -231,7 +232,7 @@ MHD_strx_to_uint64_n_ (const char * str,
 /**
  * Generic function for converting not more then @a maxlen
  * hexadecimal or decimal US-ASCII digits in string to number.
- * Conversion stopped at first non-digit character or after @a maxlen 
+ * Conversion stopped at first non-digit character or after @a maxlen
  * digits.
  * To be used only within macro.
  * @param str the string to convert
@@ -245,36 +246,44 @@ MHD_strx_to_uint64_n_ (const char * str,
  *         then @ max_val or @a out_val is NULL
  */
 size_t
-MHD_str_to_uvalue_n_ (const char * str,
+MHD_str_to_uvalue_n_ (const char *str,
                       size_t maxlen,
-                      void * out_val,
+                      void *out_val,
                       size_t val_size,
                       uint64_t max_val,
                       int base);
 
-#define MHD_str_to_uint64_(s,ov) MHD_str_to_uvalue_n_((s),SIZE_MAX,(ov),\
-                                             sizeof(uint64_t),UINT64_MAX,10)
+#define MHD_str_to_uint64_(s,ov) MHD_str_to_uvalue_n_ ((s),SIZE_MAX,(ov), \
+                                                       sizeof(uint64_t), \
+                                                       UINT64_MAX,10)
 
-#define MHD_str_to_uint64_n_(s,ml,ov) MHD_str_to_uvalue_n_((s),(ml),(ov),\
-                                             sizeof(uint64_t),UINT64_MAX,10)
+#define MHD_str_to_uint64_n_(s,ml,ov) MHD_str_to_uvalue_n_ ((s),(ml),(ov), \
+                                                            sizeof(uint64_t), \
+                                                            UINT64_MAX,10)
 
-#define MHD_strx_to_sizet_(s,ov) MHD_str_to_uvalue_n_((s),SIZE_MAX,(ov),\
-                                             sizeof(size_t),SIZE_MAX,16)
+#define MHD_strx_to_sizet_(s,ov) MHD_str_to_uvalue_n_ ((s),SIZE_MAX,(ov), \
+                                                       sizeof(size_t),SIZE_MAX, \
+                                                       16)
 
-#define MHD_strx_to_sizet_n_(s,ml,ov) MHD_str_to_uvalue_n_((s),(ml),(ov),\
-                                             sizeof(size_t),SIZE_MAX,16)
+#define MHD_strx_to_sizet_n_(s,ml,ov) MHD_str_to_uvalue_n_ ((s),(ml),(ov), \
+                                                            sizeof(size_t), \
+                                                            SIZE_MAX,16)
 
-#define MHD_strx_to_uint32_(s,ov) MHD_str_to_uvalue_n_((s),SIZE_MAX,(ov),\
-                                             sizeof(uint32_t),UINT32_MAX,16)
+#define MHD_strx_to_uint32_(s,ov) MHD_str_to_uvalue_n_ ((s),SIZE_MAX,(ov), \
+                                                        sizeof(uint32_t), \
+                                                        UINT32_MAX,16)
 
-#define MHD_strx_to_uint32_n_(s,ml,ov) MHD_str_to_uvalue_n_((s),(ml),(ov),\
-                                             sizeof(uint32_t),UINT32_MAX,16)
+#define MHD_strx_to_uint32_n_(s,ml,ov) MHD_str_to_uvalue_n_ ((s),(ml),(ov), \
+                                                             sizeof(uint32_t), \
+                                                             UINT32_MAX,16)
 
-#define MHD_strx_to_uint64_(s,ov) MHD_str_to_uvalue_n_((s),SIZE_MAX,(ov),\
-                                             sizeof(uint64_t),UINT64_MAX,16)
+#define MHD_strx_to_uint64_(s,ov) MHD_str_to_uvalue_n_ ((s),SIZE_MAX,(ov), \
+                                                        sizeof(uint64_t), \
+                                                        UINT64_MAX,16)
 
-#define MHD_strx_to_uint64_n_(s,ml,ov) MHD_str_to_uvalue_n_((s),(ml),(ov),\
-                                             sizeof(uint64_t),UINT64_MAX,16)
+#define MHD_strx_to_uint64_n_(s,ml,ov) MHD_str_to_uvalue_n_ ((s),(ml),(ov), \
+                                                             sizeof(uint64_t), \
+                                                             UINT64_MAX,16)
 
 #endif /* MHD_FAVOR_SMALL_CODE */