commit 727a1f8724ce338bec2f32e2cd97323694f1d1b4
parent 915f09d3f61c14f1201dbd5427d7dd91c152a8a2
Author: Evgeny Grin <k2k@drgrin.dev>
Date: Sat, 3 May 2025 14:20:09 +0300
Fixed functions declaration/definition mismatch
Diffstat:
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
@@ -4982,7 +4982,7 @@ MHD_EXTERN_ enum MHD_StatusCode
MHD_daemon_add_connection (struct MHD_Daemon *MHD_RESTRICT daemon,
MHD_Socket client_socket,
size_t addrlen,
- const struct sockaddr *addr,
+ const struct sockaddr *MHD_RESTRICT addr,
void *connection_cntx)
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_IN_ (4);
@@ -6380,8 +6380,8 @@ MHD_FN_PAR_NONNULL_ (1);
*/
MHD_EXTERN_ enum MHD_StatusCode
MHD_response_add_header (struct MHD_Response *MHD_RESTRICT response,
- const char *name,
- const char *value)
+ const char *MHD_RESTRICT name,
+ const char *MHD_RESTRICT value)
MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_CSTR_ (2)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
diff --git a/src/include/microhttpd2_main.h.in b/src/include/microhttpd2_main.h.in
@@ -267,7 +267,7 @@ MHD_EXTERN_ enum MHD_StatusCode
MHD_daemon_add_connection (struct MHD_Daemon *MHD_RESTRICT daemon,
MHD_Socket client_socket,
size_t addrlen,
- const struct sockaddr *addr,
+ const struct sockaddr *MHD_RESTRICT addr,
void *connection_cntx)
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_IN_ (4);
@@ -1665,8 +1665,8 @@ MHD_FN_PAR_NONNULL_ (1);
*/
MHD_EXTERN_ enum MHD_StatusCode
MHD_response_add_header (struct MHD_Response *MHD_RESTRICT response,
- const char *name,
- const char *value)
+ const char *MHD_RESTRICT name,
+ const char *MHD_RESTRICT value)
MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_CSTR_ (2)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3);
diff --git a/src/mhd2/action.c b/src/mhd2/action.c
@@ -60,8 +60,8 @@ MHD_action_suspend (struct MHD_Request *request)
MHD_EXTERN_
MHD_FN_PAR_NONNULL_ (1) 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)
{
struct MHD_Action *const restrict head_act = &(request->app_act.head_act);
if (NULL == response)
@@ -263,8 +263,8 @@ MHD_upload_action_suspend (struct MHD_Request *request)
MHD_EXTERN_
MHD_FN_PAR_NONNULL_ (1) 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)
{
struct MHD_UploadAction *const restrict upl_act =
&(request->app_act.upl_act);
diff --git a/src/mhd2/daemon_add_conn.c b/src/mhd2/daemon_add_conn.c
@@ -654,10 +654,10 @@ new_connections_list_process_ (struct MHD_Daemon *daemon)
MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_IN_ (4) 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,
+ const struct sockaddr *MHD_RESTRICT addr,
void *connection_cntx)
{
bool sk_nonbl;
diff --git a/src/mhd2/daemon_funcs.c b/src/mhd2/daemon_funcs.c
@@ -70,7 +70,7 @@ mhd_daemon_trigger_itc (struct MHD_Daemon *restrict d)
MHD_INTERNAL MHD_FN_PAR_NONNULL_ALL_
MHD_FN_MUST_CHECK_RESULT_ bool
-mhd_daemon_claim_lbuf (struct MHD_Daemon *d,
+mhd_daemon_claim_lbuf (struct MHD_Daemon *restrict d,
size_t requested_size)
{
bool ret;
@@ -119,7 +119,7 @@ mhd_daemon_claim_lbuf_up_to (struct MHD_Daemon *d,
MHD_INTERNAL MHD_FN_PAR_NONNULL_ALL_ void
-mhd_daemon_reclaim_lbuf (struct MHD_Daemon *d,
+mhd_daemon_reclaim_lbuf (struct MHD_Daemon *restrict d,
size_t reclaimed_size)
{
struct MHD_Daemon *const masterd = mhd_daemon_get_master_daemon (d);
diff --git a/src/mhd2/mhd_mempool.c b/src/mhd2/mhd_mempool.c
@@ -544,7 +544,7 @@ mhd_pool_try_alloc (struct mhd_MemoryPool *restrict pool,
* bytes (old continues to be valid for @a old_size)
*/
MHD_INTERNAL void *
-mhd_pool_reallocate (struct mhd_MemoryPool *pool,
+mhd_pool_reallocate (struct mhd_MemoryPool *restrict pool,
void *restrict old,
size_t old_size,
size_t new_size)
diff --git a/src/mhd2/mhd_str.c b/src/mhd2/mhd_str.c
@@ -797,8 +797,8 @@ mhd_str_equal_caseless_bin_n (const char *const str1,
MHD_INTERNAL bool
-mhd_str_has_token_caseless (const char *str,
- const char *const token,
+mhd_str_has_token_caseless (const char *restrict str,
+ const char *const restrict token,
size_t token_len)
{
if (0 == token_len)
diff --git a/src/mhd2/mhd_str.h b/src/mhd2/mhd_str.h
@@ -129,7 +129,7 @@ mhd_str_equal_caseless_bin_n (const char *const str1,
*/
MHD_INTERNAL bool
mhd_str_has_token_caseless (const char *restrict str,
- const char *const token,
+ const char *const restrict token,
size_t token_len);
/**
diff --git a/src/mhd2/response_add_header.c b/src/mhd2/response_add_header.c
@@ -121,9 +121,9 @@ response_add_header_int (struct MHD_Response *response,
MHD_EXTERN_
MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_CSTR_ (2)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3) enum MHD_StatusCode
-MHD_response_add_header (struct MHD_Response *response,
- const char *name,
- const char *value)
+MHD_response_add_header (struct MHD_Response *MHD_RESTRICT response,
+ const char *MHD_RESTRICT name,
+ const char *MHD_RESTRICT value)
{
bool need_unlock;
enum MHD_StatusCode res;
@@ -157,9 +157,9 @@ MHD_response_add_header (struct MHD_Response *response,
MHD_EXTERN_
MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_CSTR_ (3) 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)
{
(void) response; (void) stk; (void) content;
return MHD_SC_FEATURE_DISABLED;
diff --git a/src/mhd2/response_auth_basic.c b/src/mhd2/response_auth_basic.c
@@ -142,7 +142,7 @@ MHD_FN_PAR_NONNULL_ (2)
MHD_FN_PAR_CSTR_ (2) enum MHD_StatusCode
MHD_response_add_auth_basic_challenge (
struct MHD_Response *MHD_RESTRICT response,
- const char *realm,
+ const char *MHD_RESTRICT realm,
enum MHD_Bool prefer_utf8)
{
bool need_unlock;
