[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 224/335: Minor update
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] 224/335: Minor update |
|
Date: |
Sat, 27 Jul 2024 22:02:00 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to tag stf-m2
in repository libmicrohttpd.
commit b916770d7af4fab21a6e85df550ca404c5b2af0d
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Jul 4 00:01:20 2024 +0200
Minor update
---
src/incl_priv/mhd_sys_options.h | 4 +
src/include/microhttpd2.h | 64 ++++----
src/include/microhttpd2_portability.h | 17 +++
src/{microhttpd => mhd2}/mhd_str.c | 152 +++++++++---------
src/{microhttpd => mhd2}/mhd_str.h | 280 ++++++++++++++++------------------
5 files changed, 264 insertions(+), 253 deletions(-)
diff --git a/src/incl_priv/mhd_sys_options.h b/src/incl_priv/mhd_sys_options.h
index 8685f198..bddbad57 100644
--- a/src/incl_priv/mhd_sys_options.h
+++ b/src/incl_priv/mhd_sys_options.h
@@ -214,6 +214,10 @@
#define MHD_FIXED_FLAGS_ENUM_ MHD_FIXED_ENUM_ MHD_FLAGS_ENUM_
+/* 'inline' and 'restrict' are defined in mhd_config.h if needed */
+#define MHD_INLINE inline
+
+#define MHD_RESTRICT restrict
#ifdef BUILDING_MHD_LIB
# define MHD_FIXED_ENUM_APP_SET_ /* empty */ /* handle unknown values set by
the app */
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
index bc7caa45..92289663 100644
--- a/src/include/microhttpd2.h
+++ b/src/include/microhttpd2.h
@@ -1959,8 +1959,8 @@ MHD_FN_CONST_;
typedef const struct MHD_Action *
(MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_NONNULL_ (3)
*MHD_RequestCallback)(void *cls,
- struct MHD_Request *request,
- const struct MHD_String *path,
+ struct MHD_Request *MHD_RESTRICT request,
+ const struct MHD_String *MHD_RESTRICT path,
enum MHD_HTTP_Method method,
uint_fast64_t upload_size);
@@ -2243,8 +2243,8 @@ typedef MHD_APP_SOCKET_CNTX_TYPE *
*/
MHD_EXTERN_ void
MHD_daemon_event_update (
- struct MHD_Daemon *daemon,
- struct MHD_EventUpdateContext *ecb_cntx,
+ struct MHD_Daemon *MHD_RESTRICT daemon,
+ struct MHD_EventUpdateContext *MHD_RESTRICT ecb_cntx,
enum MHD_FdState fd_current_state)
MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (2);
@@ -2268,8 +2268,8 @@ MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (2);
* @ingroup event
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_deamon_process_reg_events (struct MHD_Daemon *daemon,
- uint_fast64_t *next_max_wait)
+MHD_deamon_process_reg_events (struct MHD_Daemon *MHD_RESTRICT daemon,
+ uint_fast64_t *MHD_RESTRICT next_max_wait)
MHD_FN_PAR_NONNULL_ (1);
/* ********************* daemon options ************** */
@@ -3056,8 +3056,8 @@ MHD_connection_set_psk (
typedef void
(*MHD_PskServerCredentialsCallback)(
void *cls,
- const struct MHD_Connection *connection,
- const struct MHD_String *username,
+ const struct MHD_Connection *MHD_RESTRICT connection,
+ const struct MHD_String *MHD_RESTRICT username,
struct MHD_ServerCredentialsContext *mscc);
@@ -4086,9 +4086,10 @@ MHD_R_OPTION_TERMINATION_CALLBACK (
* error code otherwise
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_set_options (struct MHD_Daemon *daemon,
- const struct MHD_DaemonOptionAndValue *options,
- size_t options_max_num)
+MHD_daemon_set_options (
+ struct MHD_Daemon *MHD_RESTRICT daemon,
+ const struct MHD_DaemonOptionAndValue *MHD_RESTRICT options,
+ size_t options_max_num)
MHD_FN_PAR_NONNULL_ALL_;
@@ -4258,7 +4259,7 @@ MHD_FN_PAR_NONNULL_ (1);
* @ingroup specialized
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_daemon_add_connection (struct MHD_Daemon *daemon,
+MHD_daemon_add_connection (struct MHD_Daemon *MHD_RESTRICT daemon,
MHD_Socket client_socket,
size_t addrlen,
const struct sockaddr *addr,
@@ -4426,8 +4427,8 @@ MHD_RESTORE_WARN_UNUSED_FUNC_
*/
MHD_EXTERN_ enum MHD_StatusCode
MHD_connection_set_options (
- struct MHD_Connection *connection,
- const struct MHD_ConnectionOptionAndValue *options,
+ struct MHD_Connection *MHD_RESTRICT connection,
+ const struct MHD_ConnectionOptionAndValue *MHD_RESTRICT options,
size_t options_max_num)
MHD_FN_PAR_NONNULL_ALL_;
@@ -4676,9 +4677,9 @@ MHD_FN_PAR_NONNULL_ (4) MHD_FN_PAR_OUT_SIZE_ (4,3);
* @ingroup request
*/
MHD_EXTERN_ const struct MHD_String *
-MHD_request_get_value (struct MHD_Request *request,
+MHD_request_get_value (struct MHD_Request *MHD_RESTRICT request,
enum MHD_ValueKind kind,
- const char *key)
+ const char *MHD_RESTRICT key)
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
@@ -5004,8 +5005,8 @@ MHD_FN_RETURNS_NONNULL_ MHD_FN_PAR_NONNULL_ALL_;
* @ingroup action
*/
MHD_EXTERN_ const struct MHD_Action *
-MHD_action_from_response (struct MHD_Request *request,
- struct MHD_Response *response)
+MHD_action_from_response (struct MHD_Request *MHD_RESTRICT request,
+ struct MHD_Response *MHD_RESTRICT response)
MHD_FN_PAR_NONNULL_(1);
@@ -5037,9 +5038,10 @@ MHD_FN_PAR_NONNULL_(1);
* error code otherwise
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_response_set_options (struct MHD_Response *response,
- const struct MHD_ResponseOptionAndValue *options,
- size_t options_max_num)
+MHD_response_set_options (
+ struct MHD_Response *MHD_RESTRICT response,
+ const struct MHD_ResponseOptionAndValue *MHD_RESTRICT options,
+ size_t options_max_num)
MHD_FN_PAR_NONNULL_ALL_;
@@ -5192,7 +5194,7 @@ MHD_DCC_action_continue_zc (
struct MHD_DynamicContentCreatorContext *ctx,
size_t data_size,
const struct MHD_DynContentZCIoVec *iov_data,
- const char *chunk_ext)
+ const char *MHD_RESTRICT chunk_ext)
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_CSTR_ (4);
@@ -5217,7 +5219,7 @@ MHD_EXTERN_ const struct MHD_DynamicContentCreatorAction *
MHD_DCC_action_finished_with_footer (
struct MHD_DynamicContentCreatorContext *ctx,
size_t num_footers,
- const struct MHD_NameValueCStr *footers)
+ const struct MHD_NameValueCStr *MHD_RESTRICT footers)
MHD_FN_PAR_NONNULL_ (1);
@@ -5483,7 +5485,7 @@ MHD_FN_PAR_NONNULL_ (1);
* @ingroup response
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_response_add_header (struct MHD_Response *response,
+MHD_response_add_header (struct MHD_Response *MHD_RESTRICT response,
const char *name,
const char *value)
MHD_FN_PAR_NONNULL_ (1)
@@ -5503,9 +5505,9 @@ MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
* @ingroup response
*/
MHD_EXTERN_ enum MHD_StatusCode
-MHD_response_add_predef_header (struct MHD_Response *response,
+MHD_response_add_predef_header (struct MHD_Response *MHD_RESTRICT response,
enum MHD_PredefinedHeader stk,
- const char *content)
+ const char *MHD_RESTRICT content)
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
@@ -5555,8 +5557,8 @@ MHD_FN_RETURNS_NONNULL_ MHD_FN_PAR_NONNULL_ALL_;
* @ingroup action
*/
MHD_EXTERN_ const struct MHD_UploadAction *
-MHD_upload_action_from_response (struct MHD_Request *request,
- struct MHD_Response *response)
+MHD_upload_action_from_response (struct MHD_Request *MHD_RESTRICT request,
+ struct MHD_Response *MHD_RESTRICT response)
MHD_FN_PAR_NONNULL_(1);
/**
@@ -5976,11 +5978,11 @@ MHD_FN_PAR_NONNULL_ (1);
*/
typedef void
(*MHD_UpgradeHandler)(void *cls,
- struct MHD_Request *request,
+ struct MHD_Request *MHD_RESTRICT request,
size_t extra_in_size,
const char *extra_in,
MHD_Socket sock,
- struct MHD_UpgradeHandle *urh);
+ struct MHD_UpgradeHandle *MHD_RESTRICT urh);
/**
@@ -6327,7 +6329,7 @@ MHD_digest_auth_calc_userhash (enum MHD_DigestAuthAlgo
algo,
const char *username,
const char *realm,
size_t bin_buf_size,
- void *userhash_bin)
+ void *MHD_RESTRICT userhash_bin)
MHD_FN_PURE_ MHD_FN_PAR_NONNULL_ALL_ MHD_FN_PAR_CSTR_ (2)
MHD_FN_PAR_CSTR_ (3) MHD_FN_PAR_OUT_SIZE_ (5,4);
diff --git a/src/include/microhttpd2_portability.h
b/src/include/microhttpd2_portability.h
index 48341def..a934ff2f 100644
--- a/src/include/microhttpd2_portability.h
+++ b/src/include/microhttpd2_portability.h
@@ -312,6 +312,23 @@ typedef SOCKET MHD_Socket;
# endif
#endif /* MHD_INLINE */
+#if ! defined(MHD_RESTRICT)
+# if defined(restrict)
+/* Assume that proper value of 'restrict' was already defined */
+# define MHD_RESTRICT restrict
+# elif MHD_C_MINV_99
+/* C99 (and later) supports 'restrict' */
+# define MHD_RESTRICT restrict
+# elif (MHD_GNUC_MINV (3,0) || MHD_CLANG_MINV(3,0))\
+ && ! defined(__STRICT_ANSI__)
+# define MHD_RESTRICT __restrict__
+# elif defined(MHD_HAS_MSC_EXTENSION) && MHD_MSC_MINV (1400)
+# define MHD_RESTRICT __restrict
+# else
+# define MHD_RESTRICT /* empty */
+# endif
+#endif /* MHD_INLINE */
+
#if ! defined(MHD_NO__PRAGMA)
# if MHD_GNUC_MINV (4,6) && ! defined(__clang__)
diff --git a/src/microhttpd/mhd_str.c b/src/mhd2/mhd_str.c
similarity index 95%
rename from src/microhttpd/mhd_str.c
rename to src/mhd2/mhd_str.c
index 88933258..f953aa6a 100644
--- a/src/microhttpd/mhd_str.c
+++ b/src/mhd2/mhd_str.c
@@ -25,9 +25,6 @@
#include "mhd_str.h"
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif /* HAVE_STDBOOL_H */
#include <string.h>
#include "mhd_assert.h"
@@ -35,16 +32,16 @@
#include "mhd_assert.h"
#ifdef MHD_FAVOR_SMALL_CODE
-#ifdef _MHD_static_inline
-#undef _MHD_static_inline
-#endif /* _MHD_static_inline */
+# ifdef MHD_static_inline_
+# undef MHD_static_inline_
+# endif /* MHD_static_inline_ */
/* Do not force inlining and do not use macro functions, use normal static
functions instead.
This may give more flexibility for size optimizations. */
-#define _MHD_static_inline static
-#ifndef INLINE_FUNC
-#define INLINE_FUNC 1
-#endif /* !INLINE_FUNC */
+# define MHD_static_inline_ static
+# ifndef HAVE_INLINE_FUNCS
+# define HAVE_INLINE_FUNCS 1
+# endif /* !HAVE_INLINE_FUNCS */
#endif /* MHD_FAVOR_SMALL_CODE */
/*
@@ -52,7 +49,7 @@
* standards. Not affected by current locale settings.
*/
-#ifdef INLINE_FUNC
+#ifdef HAVE_INLINE_FUNCS
#if 0 /* Disable unused functions. */
/**
@@ -61,7 +58,7 @@
* @param c character to check
* @return non-zero if character is lower case letter, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciilower (char c)
{
return (c >= 'a') && (c <= 'z');
@@ -77,7 +74,7 @@ isasciilower (char c)
* @param c character to check
* @return non-zero if character is upper case letter, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciiupper (char c)
{
return (c >= 'A') && (c <= 'Z');
@@ -91,7 +88,7 @@ isasciiupper (char c)
* @param c character to check
* @return non-zero if character is letter in US-ASCII, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciialpha (char c)
{
return isasciilower (c) || isasciiupper (c);
@@ -107,7 +104,7 @@ isasciialpha (char c)
* @param c character to check
* @return non-zero if character is decimal digit, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciidigit (char c)
{
return (c >= '0') && (c <= '9');
@@ -121,7 +118,7 @@ isasciidigit (char c)
* @param c character to check
* @return non-zero if character is decimal digit, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciixdigit (char c)
{
return isasciidigit (c) ||
@@ -136,7 +133,7 @@ isasciixdigit (char c)
* @param c character to check
* @return non-zero if character is decimal digit or letter, zero otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
isasciialnum (char c)
{
return isasciialpha (c) || isasciidigit (c);
@@ -156,7 +153,7 @@ isasciialnum (char c)
* @param c character to convert
* @return converted to lower case character
*/
-_MHD_static_inline char
+MHD_static_inline_ char
toasciilower (char c)
{
return isasciiupper (c) ? (c - 'A' + 'a') : c;
@@ -172,7 +169,7 @@ toasciilower (char c)
* @param c character to convert
* @return converted to upper case character
*/
-_MHD_static_inline char
+MHD_static_inline_ char
toasciiupper (char c)
{
return isasciilower (c) ? (c - 'a' + 'A') : c;
@@ -189,7 +186,7 @@ toasciiupper (char c)
* @param c character to convert
* @return value of decimal digit or -1 if @ c is not decimal digit
*/
-_MHD_static_inline int
+MHD_static_inline_ int
todigitvalue (char c)
{
if (isasciidigit (c))
@@ -208,7 +205,7 @@ todigitvalue (char c)
* @param c character to convert
* @return value of hexadecimal digit or -1 if @ c is not hexadecimal digit
*/
-_MHD_static_inline int
+MHD_static_inline_ int
toxdigitvalue (char c)
{
#if ! defined(MHD_FAVOR_SMALL_CODE)
@@ -532,7 +529,7 @@ toxdigitvalue (char c)
* @param c2 the second char to compare
* @return boolean 'true' if chars are caseless equal, false otherwise
*/
-_MHD_static_inline bool
+MHD_static_inline_ bool
charsequalcaseless (const char c1, const char c2)
{
return ( (c1 == c2) ||
@@ -542,7 +539,7 @@ charsequalcaseless (const char c1, const char c2)
}
-#else /* !INLINE_FUNC */
+#else /* !HAVE_INLINE_FUNCS */
/**
@@ -663,12 +660,12 @@ charsequalcaseless (const char c1, const char c2)
* @return boolean 'true' if chars are caseless equal, false otherwise
*/
#define charsequalcaseless(c1, c2) \
- ( ((c1) == (c2)) || \
- (isasciiupper (c1) ? \
- (((c1) - 'A' + 'a') == (c2)) : \
- (((c1) == ((c2) - 'A' + 'a')) && isasciiupper (c2))) )
+ ( ((c1) == (c2)) || \
+ (isasciiupper (c1) ? \
+ (((c1) - 'A' + 'a') == (c2)) : \
+ (((c1) == ((c2) - 'A' + 'a')) && isasciiupper (c2))) )
-#endif /* !INLINE_FUNC */
+#endif /* !HAVE_INLINE_FUNCS */
#ifndef MHD_FAVOR_SMALL_CODE
@@ -1183,21 +1180,21 @@ MHD_str_remove_tokens_caseless_ (char *str,
/* Use individual function for each case */
/**
- * Convert decimal US-ASCII digits in string to number in uint64_t.
+ * Convert decimal US-ASCII digits in string to number in uint_fast64_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
MHD_str_to_uint64_ (const char *str,
- uint64_t *out_val)
+ uint_fast64_t *out_val)
{
const char *const start = str;
- uint64_t res;
+ uint_fast64_t res;
if (! str || ! out_val || ! isasciidigit (str[0]))
return 0;
@@ -1208,7 +1205,7 @@ MHD_str_to_uint64_ (const char *str,
const int digit = (unsigned char) (*str) - '0';
if ( (res > (UINT64_MAX / 10)) ||
( (res == (UINT64_MAX / 10)) &&
- ((uint64_t) digit > (UINT64_MAX % 10)) ) )
+ ((uint_fast64_t) digit > (UINT64_MAX % 10)) ) )
return 0;
res *= 10;
@@ -1223,23 +1220,23 @@ MHD_str_to_uint64_ (const char *str,
/**
* Convert not more then @a maxlen decimal US-ASCII digits in string to
- * number in uint64_t.
+ * number in uint_fast64_t.
* 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] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
MHD_str_to_uint64_n_ (const char *str,
size_t maxlen,
- uint64_t *out_val)
+ uint_fast64_t *out_val)
{
- uint64_t res;
+ uint_fast64_t res;
size_t i;
if (! str || ! maxlen || ! out_val || ! isasciidigit (str[0]))
@@ -1253,7 +1250,7 @@ MHD_str_to_uint64_n_ (const char *str,
if ( (res > (UINT64_MAX / 10)) ||
( (res == (UINT64_MAX / 10)) &&
- ((uint64_t) digit > (UINT64_MAX % 10)) ) )
+ ((uint_fast64_t) digit > (UINT64_MAX % 10)) ) )
return 0;
res *= 10;
@@ -1268,21 +1265,21 @@ MHD_str_to_uint64_n_ (const char *str,
/**
- * Convert hexadecimal US-ASCII digits in string to number in uint32_t.
+ * Convert hexadecimal US-ASCII digits in string to number in uint_fast32_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint32_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast32_t to store result of conversion
* @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
+ * then possible to store in uint_fast32_t or @a out_val is NULL
*/
size_t
MHD_strx_to_uint32_ (const char *str,
- uint32_t *out_val)
+ uint_fast32_t *out_val)
{
const char *const start = str;
- uint32_t res;
+ uint_fast32_t res;
int digit;
if (! str || ! out_val)
@@ -1294,7 +1291,7 @@ MHD_strx_to_uint32_ (const char *str,
{
if ( (res < (UINT32_MAX / 16)) ||
((res == (UINT32_MAX / 16)) &&
- ( (uint32_t) digit <= (UINT32_MAX % 16)) ) )
+ ( (uint_fast32_t) digit <= (UINT32_MAX % 16)) ) )
{
res *= 16;
res += (unsigned int) digit;
@@ -1313,24 +1310,24 @@ MHD_strx_to_uint32_ (const char *str,
/**
* Convert not more then @a maxlen hexadecimal US-ASCII digits in string
- * to number in uint32_t.
+ * to number in uint_fast32_t.
* 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] out_val pointer to uint32_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast32_t to store result of conversion
* @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
+ * then possible to store in uint_fast32_t or @a out_val is NULL
*/
size_t
MHD_strx_to_uint32_n_ (const char *str,
size_t maxlen,
- uint32_t *out_val)
+ uint_fast32_t *out_val)
{
size_t i;
- uint32_t res;
+ uint_fast32_t res;
int digit;
if (! str || ! out_val)
return 0;
@@ -1341,7 +1338,7 @@ MHD_strx_to_uint32_n_ (const char *str,
{
if ( (res > (UINT32_MAX / 16)) ||
((res == (UINT32_MAX / 16)) &&
- ( (uint32_t) digit > (UINT32_MAX % 16)) ) )
+ ( (uint_fast32_t) digit > (UINT32_MAX % 16)) ) )
return 0;
res *= 16;
@@ -1356,21 +1353,21 @@ MHD_strx_to_uint32_n_ (const char *str,
/**
- * Convert hexadecimal US-ASCII digits in string to number in uint64_t.
+ * Convert hexadecimal US-ASCII digits in string to number in uint_fast64_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
MHD_strx_to_uint64_ (const char *str,
- uint64_t *out_val)
+ uint_fast64_t *out_val)
{
const char *const start = str;
- uint64_t res;
+ uint_fast64_t res;
int digit;
if (! str || ! out_val)
return 0;
@@ -1381,7 +1378,7 @@ MHD_strx_to_uint64_ (const char *str,
{
if ( (res < (UINT64_MAX / 16)) ||
((res == (UINT64_MAX / 16)) &&
- ( (uint64_t) digit <= (UINT64_MAX % 16)) ) )
+ ( (uint_fast64_t) digit <= (UINT64_MAX % 16)) ) )
{
res *= 16;
res += (unsigned int) digit;
@@ -1400,24 +1397,24 @@ MHD_strx_to_uint64_ (const char *str,
/**
* Convert not more then @a maxlen hexadecimal US-ASCII digits in string
- * to number in uint64_t.
+ * to number in uint_fast64_t.
* 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] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
MHD_strx_to_uint64_n_ (const char *str,
size_t maxlen,
- uint64_t *out_val)
+ uint_fast64_t *out_val)
{
size_t i;
- uint64_t res;
+ uint_fast64_t res;
int digit;
if (! str || ! out_val)
return 0;
@@ -1428,7 +1425,7 @@ MHD_strx_to_uint64_n_ (const char *str,
{
if ( (res > (UINT64_MAX / 16)) ||
((res == (UINT64_MAX / 16)) &&
- ( (uint64_t) digit > (UINT64_MAX % 16)) ) )
+ ( (uint_fast64_t) digit > (UINT64_MAX % 16)) ) )
return 0;
res *= 16;
@@ -1466,13 +1463,13 @@ MHD_str_to_uvalue_n_ (const char *str,
size_t maxlen,
void *out_val,
size_t val_size,
- uint64_t max_val,
+ uint_fast64_t max_val,
unsigned int base)
{
size_t i;
- uint64_t res;
- const uint64_t max_v_div_b = max_val / base;
- const uint64_t max_v_mod_b = max_val % base;
+ uint_fast64_t res;
+ const uint_fast64_t max_v_div_b = max_val / base;
+ const uint_fast64_t max_v_mod_b = max_val % base;
if (! str || ! out_val ||
((base != 16) && (base != 10)) )
@@ -1488,7 +1485,8 @@ MHD_str_to_uvalue_n_ (const char *str,
if (0 > digit)
break;
if ( ((max_v_div_b) < res) ||
- (( (max_v_div_b) == res) && ( (max_v_mod_b) < (uint64_t) digit) ) )
+ (( (max_v_div_b) == res) &&
+ ( (max_v_mod_b) < (uint_fast64_t) digit) ) )
return 0;
res *= base;
@@ -1499,9 +1497,9 @@ MHD_str_to_uvalue_n_ (const char *str,
if (i)
{
if (8 == val_size)
- *(uint64_t *) out_val = res;
+ *(uint_fast64_t *) out_val = res;
else if (4 == val_size)
- *(uint32_t *) out_val = (uint32_t) res;
+ *(uint_fast32_t *) out_val = (uint_fast32_t) res;
else
return 0;
}
@@ -1513,7 +1511,7 @@ MHD_str_to_uvalue_n_ (const char *str,
size_t
-MHD_uint32_to_strx (uint32_t val,
+MHD_uint32_to_strx (uint_fast32_t val,
char *buf,
size_t buf_size)
{
@@ -1547,13 +1545,13 @@ MHD_uint32_to_strx (uint32_t val,
#ifndef MHD_FAVOR_SMALL_CODE
size_t
-MHD_uint16_to_str (uint16_t val,
+MHD_uint16_to_str (uint_fast16_t val,
char *buf,
size_t buf_size)
{
char *chr; /**< pointer to the current printed digit */
/* The biggest printable number is 65535 */
- uint16_t divisor = UINT16_C (10000);
+ uint_fast16_t divisor = UINT16_C (10000);
int digit;
chr = buf;
@@ -1575,7 +1573,7 @@ MHD_uint16_to_str (uint16_t val,
buf_size--;
if (1 == divisor)
return (size_t) (chr - buf);
- val = (uint16_t) (val % divisor);
+ val = (uint_fast16_t) (val % divisor);
divisor /= 10;
digit = (int) (val / divisor);
mhd_assert (digit < 10);
@@ -1588,13 +1586,13 @@ MHD_uint16_to_str (uint16_t val,
size_t
-MHD_uint64_to_str (uint64_t val,
+MHD_uint64_to_str (uint_fast64_t val,
char *buf,
size_t buf_size)
{
char *chr; /**< pointer to the current printed digit */
/* The biggest printable number is 18446744073709551615 */
- uint64_t divisor = UINT64_C (10000000000000000000);
+ uint_fast64_t divisor = UINT64_C (10000000000000000000);
int digit;
chr = buf;
diff --git a/src/microhttpd/mhd_str.h b/src/mhd2/mhd_str.h
similarity index 78%
rename from src/microhttpd/mhd_str.h
rename to src/mhd2/mhd_str.h
index 08872036..a17dc96e 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/mhd2/mhd_str.h
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- Copyright (C) 2015-2023 Karlson2k (Evgeny Grin)
+ Copyright (C) 2015-2024 Karlson2k (Evgeny Grin)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
*/
/**
- * @file microhttpd/mhd_str.h
+ * @file src/mhd2/mhd_str.h
* @brief Header for string manipulating helpers
* @author Karlson2k (Evgeny Grin)
*/
@@ -26,28 +26,10 @@
#ifndef MHD_STR_H
#define MHD_STR_H 1
-#include "mhd_options.h"
-#include <stdint.h>
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif /* HAVE_STDDEF_H */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif /* HAVE_STDBOOL_H */
-
-#include "mhd_str_types.h"
-
-#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
-#define _SSIZE_T_DEFINED
-typedef intptr_t ssize_t;
-#endif /* !_SSIZE_T_DEFINED */
-
-#ifdef MHD_FAVOR_SMALL_CODE
-#include "mhd_limits.h"
-#endif /* MHD_FAVOR_SMALL_CODE */
+#include "mhd_sys_options.h"
+#include "sys_base_types.h"
+#include "sys_bool_type.h"
+#include "mhd_str_macros.h"
/*
* Block of functions/macros that use US-ASCII charset as required by HTTP
@@ -63,13 +45,13 @@ typedef intptr_t ssize_t;
* @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)
+/* 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)
#endif /* MHD_FAVOR_SMALL_CODE */
@@ -84,9 +66,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);
/**
@@ -100,9 +82,9 @@ MHD_str_equal_caseless_n_ (const char *const str1,
* @return non-zero if @a len bytes 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);
/**
@@ -119,9 +101,9 @@ MHD_str_equal_caseless_bin_n_ (const char *const str1,
* @param len number of characters to compare
* @return non-zero if @a len bytes are equal, zero otherwise.
*/
-#define MHD_str_equal_caseless_s_bin_n_(a,s,l) \
- ((MHD_STATICSTR_LEN_(a) == (l)) \
- && MHD_str_equal_caseless_bin_n_(a,s,l))
+#define mhd_str_equal_caseless_s_bin_n(a,s,l) \
+ ((mhd_SSTR_LEN (a) == (l)) \
+ && mhd_str_equal_caseless_bin_n (a,s,l))
/**
* Check whether @a str has case-insensitive @a token.
@@ -137,9 +119,9 @@ 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,
- size_t token_len);
+mhd_str_has_token_caseless (const char *str,
+ const char *const token,
+ size_t token_len);
/**
* Check whether @a str has case-insensitive static @a tkn.
@@ -151,8 +133,8 @@ MHD_str_has_token_caseless_ (const char *str,
* @param tkn the static string of token to find
* @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))
+#define mhd_str_has_s_token_caseless(str,tkn) \
+ mhd_str_has_token_caseless ((str),(tkn),mhd_SSTR_LEN (tkn))
/**
@@ -184,12 +166,12 @@ MHD_str_has_token_caseless_ (const char *str,
* 'false' otherwise.
*/
bool
-MHD_str_remove_token_caseless_ (const char *str,
- size_t str_len,
- const char *const token,
- const size_t token_len,
- char *buf,
- ssize_t *buf_size);
+mhd_str_remove_token_caseless (const char *str,
+ size_t str_len,
+ const char *const token,
+ const size_t token_len,
+ char *buf,
+ ssize_t *buf_size);
/**
@@ -216,114 +198,114 @@ MHD_str_remove_token_caseless_ (const char *str,
* 'false' otherwise.
*/
bool
-MHD_str_remove_tokens_caseless_ (char *str,
- size_t *str_len,
- const char *const tokens,
- const size_t tokens_len);
+mhd_str_remove_tokens_caseless (char *str,
+ size_t *str_len,
+ const char *const tokens,
+ const size_t tokens_len);
#ifndef MHD_FAVOR_SMALL_CODE
/* Use individual function for each case to improve speed */
/**
- * Convert decimal US-ASCII digits in string to number in uint64_t.
+ * Convert decimal US-ASCII digits in string to number in uint_fast64_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_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,
+ uint_fast64_t *out_val);
/**
* Convert not more then @a maxlen decimal US-ASCII digits in string to
- * number in uint64_t.
+ * number in uint_fast64_t.
* 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] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
-MHD_str_to_uint64_n_ (const char *str,
- size_t maxlen,
- uint64_t *out_val);
+mhd_str_to_uint64_n (const char *str,
+ size_t maxlen,
+ uint_fast64_t *out_val);
/**
- * Convert hexadecimal US-ASCII digits in string to number in uint32_t.
+ * Convert hexadecimal US-ASCII digits in string to number in uint_fast32_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint32_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast32_t to store result of conversion
* @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
+ * then possible to store in uint_fast32_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,
+ uint_fast32_t *out_val);
/**
* Convert not more then @a maxlen hexadecimal US-ASCII digits in string
- * to number in uint32_t.
+ * to number in uint_fast32_t.
* 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] out_val pointer to uint32_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast32_t to store result of conversion
* @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
+ * then possible to store in uint_fast32_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,
+ uint_fast32_t *out_val);
/**
- * Convert hexadecimal US-ASCII digits in string to number in uint64_t.
+ * Convert hexadecimal US-ASCII digits in string to number in uint_fast64_t.
* Conversion stopped at first non-digit character.
*
* @param str string to convert
- * @param[out] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_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,
+ uint_fast64_t *out_val);
/**
* Convert not more then @a maxlen hexadecimal US-ASCII digits in string
- * to number in uint64_t.
+ * to number in uint_fast64_t.
* 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] out_val pointer to uint64_t to store result of conversion
+ * @param[out] out_val pointer to uint_fast64_t to store result of conversion
* @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
+ * then possible to store in uint_fast64_t or @a out_val is NULL
*/
size_t
-MHD_strx_to_uint64_n_ (const char *str,
- size_t maxlen,
- uint64_t *out_val);
+mhd_strx_to_uint64_n (const char *str,
+ size_t maxlen,
+ uint_fast64_t *out_val);
#else /* MHD_FAVOR_SMALL_CODE */
/* Use one universal function and macros to reduce size */
@@ -346,50 +328,58 @@ MHD_strx_to_uint64_n_ (const char *str,
* then @a max_val, @a val_size is not 4/8 or @a out_val is NULL
*/
size_t
-MHD_str_to_uvalue_n_ (const char *str,
- size_t maxlen,
- void *out_val,
- size_t val_size,
- uint64_t max_val,
- unsigned 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_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_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_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_n_(s,ml,ov) MHD_str_to_uvalue_n_ ((s),(ml),(ov), \
- sizeof(uint64_t),
\
- UINT64_MAX,16)
+mhd_str_to_uvalue_n (const char *str,
+ size_t maxlen,
+ void *out_val,
+ size_t val_size,
+ uint_fast64_t max_val,
+ unsigned int base);
+
+#define mhd_str_to_uint64(s,ov) \
+ mhd_str_to_uvalue_n ((s),SIZE_MAX,(ov), \
+ sizeof(uint_fast64_t), \
+ UINT64_MAX,10)
+
+#define mhd_str_to_uint64_n(s,ml,ov) \
+ mhd_str_to_uvalue_n ((s),(ml),(ov), \
+ sizeof(uint_fast64_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_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(uint_fast32_t), \
+ UINT32_MAX,16)
+
+#define mhd_strx_to_uint32_n(s,ml,ov) \
+ mhd_str_to_uvalue_n ((s),(ml),(ov), \
+ sizeof(uint_fast32_t), \
+ UINT32_MAX,16)
+
+#define mhd_strx_to_uint64(s,ov) \
+ mhd_str_to_uvalue_n ((s),SIZE_MAX,(ov), \
+ sizeof(uint_fast64_t), \
+ UINT64_MAX,16)
+
+#define mhd_strx_to_uint64_n(s,ml,ov) \
+ mhd_str_to_uvalue_n ((s),(ml),(ov), \
+ sizeof(uint_fast64_t), \
+ UINT64_MAX,16)
#endif /* MHD_FAVOR_SMALL_CODE */
/**
- * Convert uint32_t value to hexdecimal US-ASCII string.
+ * Convert uint_fast32_t value to hexdecimal US-ASCII string.
* @note: result is NOT zero-terminated.
* @param val the value to convert
* @param buf the buffer to result to
@@ -398,14 +388,14 @@ MHD_str_to_uvalue_n_ (const char *str,
* zero if buffer is too small (buffer may be modified).
*/
size_t
-MHD_uint32_to_strx (uint32_t val,
+mhd_uint32_to_strx (uint_fast32_t val,
char *buf,
size_t buf_size);
#ifndef MHD_FAVOR_SMALL_CODE
/**
- * Convert uint16_t value to decimal US-ASCII string.
+ * Convert uint_fast16_t value to decimal US-ASCII string.
* @note: result is NOT zero-terminated.
* @param val the value to convert
* @param buf the buffer to result to
@@ -414,17 +404,17 @@ MHD_uint32_to_strx (uint32_t val,
* zero if buffer is too small (buffer may be modified).
*/
size_t
-MHD_uint16_to_str (uint16_t val,
+mhd_uint16_to_str (uint_fast16_t val,
char *buf,
size_t buf_size);
#else /* MHD_FAVOR_SMALL_CODE */
-#define MHD_uint16_to_str(v,b,s) MHD_uint64_to_str(v,b,s)
+#define MHD_uint16_to_str(v,b,s) MHD_uint64_to_str (v,b,s)
#endif /* MHD_FAVOR_SMALL_CODE */
/**
- * Convert uint64_t value to decimal US-ASCII string.
+ * Convert uint_fast64_t value to decimal US-ASCII string.
* @note: result is NOT zero-terminated.
* @param val the value to convert
* @param buf the buffer to result to
@@ -433,13 +423,13 @@ MHD_uint16_to_str (uint16_t val,
* zero if buffer is too small (buffer may be modified).
*/
size_t
-MHD_uint64_to_str (uint64_t val,
+mhd_uint64_to_str (uint_fast64_t val,
char *buf,
size_t buf_size);
/**
- * Convert uint16_t value to decimal US-ASCII string padded with
+ * Convert uint_fast16_t value to decimal US-ASCII string padded with
* zeros on the left side.
*
* @note: result is NOT zero-terminated.
@@ -454,7 +444,7 @@ MHD_uint64_to_str (uint64_t val,
* zero if buffer is too small (buffer may be modified).
*/
size_t
-MHD_uint8_to_str_pad (uint8_t val,
+mhd_uint8_to_str_pad (uint8_t val,
uint8_t min_digits,
char *buf,
size_t buf_size);
@@ -470,7 +460,7 @@ MHD_uint8_to_str_pad (uint8_t val,
* @return The number of characters written to the output buffer.
*/
size_t
-MHD_bin_to_hex (const void *bin,
+mhd_bin_to_hex (const void *bin,
size_t size,
char *hex);
@@ -484,7 +474,7 @@ MHD_bin_to_hex (const void *bin,
* not including terminating zero.
*/
size_t
-MHD_bin_to_hex_z (const void *bin,
+mhd_bin_to_hex_z (const void *bin,
size_t size,
char *hex);
@@ -502,7 +492,7 @@ MHD_bin_to_hex_z (const void *bin,
* zero if found any character which is not hexadecimal digits
*/
size_t
-MHD_hex_to_bin (const char *hex,
+mhd_hex_to_bin (const char *hex,
size_t len,
void *bin);
@@ -525,7 +515,7 @@ MHD_hex_to_bin (const char *hex,
* small to hold the result
*/
size_t
-MHD_str_pct_decode_strict_n_ (const char *pct_encoded,
+mhd_str_pct_decode_strict_n_ (const char *pct_encoded,
size_t pct_encoded_len,
char *decoded,
size_t buf_size);
@@ -553,7 +543,7 @@ MHD_str_pct_decode_strict_n_ (const char *pct_encoded,
* zero if output buffer is too small to hold the result
*/
size_t
-MHD_str_pct_decode_lenient_n_ (const char *pct_encoded,
+mhd_str_pct_decode_lenient_n_ (const char *pct_encoded,
size_t pct_encoded_len,
char *decoded,
size_t buf_size,
@@ -620,7 +610,7 @@ MHD_str_pct_decode_in_place_lenient_ (char *str,
* first string.
*/
bool
-MHD_str_equal_quoted_bin_n (const char *quoted,
+mhd_str_equal_quoted_bin_n (const char *quoted,
size_t quoted_len,
const char *unquoted,
size_t unquoted_len);
@@ -642,7 +632,7 @@ MHD_str_equal_quoted_bin_n (const char *quoted,
* first string.
*/
#define MHD_str_equal_quoted_s_bin_n(q,l,u) \
- MHD_str_equal_quoted_bin_n(q,l,u,MHD_STATICSTR_LEN_(u))
+ MHD_str_equal_quoted_bin_n (q,l,u,mhd_SSTR_LEN (u))
/**
* Check two strings for equality, "unquoting" the first string from quoted
@@ -665,7 +655,7 @@ MHD_str_equal_quoted_bin_n (const char *quoted,
* first string.
*/
bool
-MHD_str_equal_caseless_quoted_bin_n (const char *quoted,
+mhd_str_equal_caseless_quoted_bin_n (const char *quoted,
size_t quoted_len,
const char *unquoted,
size_t unquoted_len);
@@ -688,7 +678,7 @@ MHD_str_equal_caseless_quoted_bin_n (const char *quoted,
* first string.
*/
#define MHD_str_equal_caseless_quoted_s_bin_n(q,l,u) \
- MHD_str_equal_caseless_quoted_bin_n(q,l,u,MHD_STATICSTR_LEN_(u))
+ MHD_str_equal_caseless_quoted_bin_n (q,l,u,mhd_SSTR_LEN (u))
/**
* Convert string from quoted to unquoted form as specified by
@@ -706,7 +696,7 @@ MHD_str_equal_caseless_quoted_bin_n (const char *quoted,
* @a quoted_len is zero).
*/
size_t
-MHD_str_unquote (const char *quoted,
+mhd_str_unquote (const char *quoted,
size_t quoted_len,
char *result);
@@ -730,7 +720,7 @@ MHD_str_unquote (const char *quoted,
* string is larger than @a buf_size.
*/
size_t
-MHD_str_quote (const char *unquoted,
+mhd_str_quote (const char *unquoted,
size_t unquoted_len,
char *result,
size_t buf_size);
@@ -767,7 +757,7 @@ MHD_str_quote (const char *unquoted,
* (base64_len / 4 * 3), depending on the number of padding characters.
*/
size_t
-MHD_base64_to_bin_n (const char *base64,
+mhd_base64_to_bin_n (const char *base64,
size_t base64_len,
void *bin,
size_t bin_size);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] 243/335: Copy-paste fixes, (continued)
- [libmicrohttpd] 243/335: Copy-paste fixes, gnunet, 2024/07/27
- [libmicrohttpd] 225/335: Still WIP, gnunet, 2024/07/27
- [libmicrohttpd] 242/335: Fixes, gnunet, 2024/07/27
- [libmicrohttpd] 245/335: WIP-4, gnunet, 2024/07/27
- [libmicrohttpd] 231/335: WIP more, gnunet, 2024/07/27
- [libmicrohttpd] 235/335: GNU/Linux fixes, gnunet, 2024/07/27
- [libmicrohttpd] 237/335: GNU/Linux fixes-3, gnunet, 2024/07/27
- [libmicrohttpd] 236/335: More GNU/Linux fixes, gnunet, 2024/07/27
- [libmicrohttpd] 251/335: Implemented MHD_daemon_get_info_fixed_sz(), gnunet, 2024/07/27
- [libmicrohttpd] 246/335: WIP-5, gnunet, 2024/07/27
- [libmicrohttpd] 224/335: Minor update,
gnunet <=
- [libmicrohttpd] 253/335: fix issues in test logic, gnunet, 2024/07/27
- [libmicrohttpd] 240/335: more example test code, gnunet, 2024/07/27
- [libmicrohttpd] 254/335: Fixed GET parameters parsing, gnunet, 2024/07/27
- [libmicrohttpd] 239/335: first test against test framework, gnunet, 2024/07/27
- [libmicrohttpd] 241/335: WIP-3, gnunet, 2024/07/27
- [libmicrohttpd] 248/335: WIP-5 fixes-2, gnunet, 2024/07/27
- [libmicrohttpd] 244/335: microhttpd2.h: improved URI and termination callbacks and related data, gnunet, 2024/07/27
- [libmicrohttpd] 252/335: expand test suite, gnunet, 2024/07/27
- [libmicrohttpd] 260/335: Copy-paste & merge errors clean-up, gnunet, 2024/07/27
- [libmicrohttpd] 247/335: WIP-5 fixes, gnunet, 2024/07/27