commit 35fd491048c83ae47e984a7cc6abf1af4f43c2b7
parent 29a39f4fac4621f7de8c135f5eb94f269a07843b
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Fri, 30 Oct 2026 17:42:48 +0100
Added a few missing internal function attributes
Diffstat:
7 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/mhd2/http_status_str.c b/src/mhd2/http_status_str.c
@@ -213,7 +213,7 @@ MHD_HTTP_status_code_to_string (enum MHD_HTTP_StatusCode code)
}
-MHD_INTERNAL MHD_FN_CONST_ const struct MHD_String *
+MHD_INTERNAL MHD_FN_CONST_ MHD_FN_RETURNS_NONNULL_ const struct MHD_String *
mhd_HTTP_status_code_to_string_int (uint_fast16_t code)
{
static const struct MHD_String no_status =
diff --git a/src/mhd2/http_status_str.h b/src/mhd2/http_status_str.h
@@ -59,7 +59,7 @@
*/
MHD_INTERNAL const struct MHD_String *
mhd_HTTP_status_code_to_string_int (uint_fast16_t code)
-MHD_FN_CONST_;
+MHD_FN_CONST_ MHD_FN_RETURNS_NONNULL_;
#endif /* ! MHD_HTTP_STATUS_STR_H */
diff --git a/src/mhd2/mempool_funcs.c b/src/mhd2/mempool_funcs.c
@@ -417,7 +417,7 @@ mhd_pool_get_size (const struct mhd_MemoryPool *restrict pool)
}
-MHD_INTERNAL size_t
+MHD_INTERNAL MHD_FN_PAR_NONNULL_ (1) size_t
mhd_pool_get_free (struct mhd_MemoryPool *restrict pool)
{
mhd_assert (pool->end >= pool->pos);
@@ -431,7 +431,7 @@ mhd_pool_get_free (struct mhd_MemoryPool *restrict pool)
}
-MHD_INTERNAL mhd_FN_RET_UNALIASED
+MHD_INTERNAL MHD_FN_PAR_NONNULL_ (1) mhd_FN_RET_UNALIASED
mhd_FN_RET_SIZED (2)
mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE)void *
mhd_pool_allocate (struct mhd_MemoryPool *restrict pool,
@@ -464,7 +464,8 @@ mhd_pool_allocate (struct mhd_MemoryPool *restrict pool,
}
-MHD_INTERNAL MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) bool
+MHD_INTERNAL MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) bool
mhd_pool_is_resizable_inplace (struct mhd_MemoryPool *restrict pool,
void *restrict block,
size_t block_size)
@@ -486,7 +487,8 @@ mhd_pool_is_resizable_inplace (struct mhd_MemoryPool *restrict pool,
}
-MHD_INTERNAL mhd_FN_RET_UNALIASED
+MHD_INTERNAL MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (3)
+MHD_FN_PAR_OUT_ (3) mhd_FN_RET_UNALIASED
mhd_FN_RET_SIZED (2)
mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE)void *
mhd_pool_try_alloc (struct mhd_MemoryPool *restrict pool,
@@ -524,6 +526,7 @@ mhd_pool_try_alloc (struct mhd_MemoryPool *restrict pool,
MHD_INTERNAL
+MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
mhd_FN_RET_SIZED (4)
void *
@@ -609,7 +612,8 @@ mhd_pool_reallocate (struct mhd_MemoryPool *restrict pool,
}
-MHD_INTERNAL MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) void
+MHD_INTERNAL MHD_FN_PAR_NONNULL_ (1)
+MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) void
mhd_pool_deallocate (struct mhd_MemoryPool *restrict pool,
void *restrict block,
size_t block_size)
@@ -702,6 +706,7 @@ mhd_pool_deallocate (struct mhd_MemoryPool *restrict pool,
MHD_INTERNAL
+MHD_FN_PAR_NONNULL_ (1)
MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
mhd_FN_RET_SIZED (4) mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE)
void *
diff --git a/src/mhd2/mempool_funcs.h b/src/mhd2/mempool_funcs.h
@@ -114,6 +114,7 @@ MHD_INTERNAL void *
mhd_pool_allocate (struct mhd_MemoryPool *restrict pool,
size_t size,
bool from_end)
+MHD_FN_PAR_NONNULL_ (1)
mhd_FN_RET_UNALIASED mhd_FN_RET_SIZED (2)
mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE);
@@ -131,7 +132,7 @@ MHD_INTERNAL bool
mhd_pool_is_resizable_inplace (struct mhd_MemoryPool *restrict pool,
void *restrict block,
size_t block_size)
-MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3);
+MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3);
/**
* Try to allocate @a size bytes memory area from the @a pool.
@@ -156,6 +157,7 @@ MHD_INTERNAL void *
mhd_pool_try_alloc (struct mhd_MemoryPool *restrict pool,
size_t size,
size_t *restrict required_bytes)
+MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (3) MHD_FN_PAR_OUT_ (3)
mhd_FN_RET_UNALIASED mhd_FN_RET_SIZED (2)
mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE);
@@ -182,7 +184,7 @@ mhd_pool_reallocate (struct mhd_MemoryPool *restrict pool,
void *restrict old,
size_t old_size,
size_t new_size)
-MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
+MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
mhd_FN_RET_SIZED (4);
/**
@@ -201,7 +203,8 @@ MHD_FN_PAR_NONNULL_ALL_ MHD_FN_PURE_;
* @return number of bytes still available in @a pool
*/
MHD_INTERNAL size_t
-mhd_pool_get_free (struct mhd_MemoryPool *restrict pool);
+mhd_pool_get_free (struct mhd_MemoryPool *restrict pool)
+MHD_FN_PAR_NONNULL_ (1);
/**
@@ -220,7 +223,7 @@ MHD_INTERNAL void
mhd_pool_deallocate (struct mhd_MemoryPool *restrict pool,
void *restrict block,
size_t block_size)
-MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3);
+MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3);
/**
@@ -241,7 +244,7 @@ mhd_pool_reset (struct mhd_MemoryPool *restrict pool,
void *restrict keep,
size_t copy_bytes,
size_t new_size)
-MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
+MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3)
mhd_FN_RET_SIZED (4) mhd_FN_RET_ALIGNED (mhd_MEMPOOL_ALIGN_SIZE);
#endif /* ! MHD_MEMPOOL_FUNCS_H */
diff --git a/src/mhd2/mhd_send.c b/src/mhd2/mhd_send.c
@@ -961,6 +961,7 @@ mhd_send_data (struct MHD_Connection *restrict connection,
MHD_INTERNAL
MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (3)
MHD_FN_PAR_NONNULL_IF_NONZERO_ (6, 5)
+MHD_FN_PAR_NONNULL_ (8) MHD_FN_PAR_OUT_ (8)
MHD_FN_PAR_IN_SIZE_ (3, 2) MHD_FN_PAR_IN_SIZE_ (6, 5) enum mhd_SocketError
mhd_send_hdr_and_body (struct MHD_Connection *restrict connection,
size_t header_size,
diff --git a/src/mhd2/mhd_send.h b/src/mhd2/mhd_send.h
@@ -119,7 +119,8 @@ mhd_send_hdr_and_body (struct MHD_Connection *restrict connection,
size_t *restrict sent)
MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_ (3)
MHD_FN_PAR_NONNULL_IF_NONZERO_ (6, 5)
-MHD_FN_PAR_IN_SIZE_ (3, 2) MHD_FN_PAR_IN_SIZE_ (6, 5) MHD_FN_PAR_OUT_ (8);
+MHD_FN_PAR_NONNULL_ (8) MHD_FN_PAR_OUT_ (8)
+MHD_FN_PAR_IN_SIZE_ (3, 2) MHD_FN_PAR_IN_SIZE_ (6, 5);
#if defined(mhd_USE_SENDFILE)
/**
diff --git a/src/mhd2/stream_process_request.c b/src/mhd2/stream_process_request.c
@@ -3831,7 +3831,7 @@ mhd_stream_process_req_recv_finished (struct MHD_Connection *restrict c)
* Can be NULL.
* @param chunk_size_line_size the size of the @a chunk_size_line
*/
-static MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) void
+static MHD_FN_PAR_NONNULL_ (1) MHD_FN_PAR_NONNULL_IF_NONZERO_ (2, 3) void
handle_req_chunk_size_line_no_space (struct MHD_Connection *c,
const char *chunk_size_line,
size_t chunk_size_line_size)
