commit ca67c1bb9124dc0592284762aae1368dea5ae393
parent 4f9e62d7cdcfca96be80ef03e20113e2652f95a3
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Mon, 5 May 2025 02:41:13 +0200
Fixed compiler warnings
Diffstat:
6 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/mhd2/daemon_create.c b/src/mhd2/daemon_create.c
@@ -102,7 +102,7 @@ MHD_daemon_create (MHD_RequestCallback req_cb,
s->tls_cert_key.v_mem_key = NULL;
s->tls_cert_key.v_mem_pass = NULL;
- d->log_params.v_log_cb = NULL; /* optional */
+ /* d->log_params.v_log_cb = NULL; */ /* used directly */
#endif /* !HAVE_NULL_PTR_ALL_ZEROS */
s->large_pool_size = SIZE_MAX; /* The impossible value */
@@ -110,7 +110,7 @@ MHD_daemon_create (MHD_RequestCallback req_cb,
s->listen_socket = MHD_INVALID_SOCKET;
s->fd_number_limit = MHD_INVALID_SOCKET;
- d->log_params.v_log_cb = mhd_logger_default;
+ d->log_params.v_log_cb = (MHD_LoggingCallback) mhd_logger_default;
d->req_cfg.cb = req_cb;
d->req_cfg.cb_cls = req_cb_cls;
d->settings = s;
diff --git a/src/mhd2/daemon_start.c b/src/mhd2/daemon_start.c
@@ -411,7 +411,8 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
memcpy (&(sa_all.sa_i4), s->bind_sa.v_sa, sizeof(sa_all.sa_i4));
sk_port = (uint_least16_t) ntohs (sa_all.sa_i4.sin_port);
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
- sa_all.sa_i4.sin_len = (socklen_t) sizeof(sa_all.sa_i4);
+ mhd_assert (sizeof(sa_all.sa_i4) == (uint8_t) sizeof(sa_all.sa_i4));
+ sa_all.sa_i4.sin_len = (uint8_t) sizeof(sa_all.sa_i4);
#endif
p_use_sa = (struct sockaddr *) &(sa_all.sa_i4);
use_sa_size = (socklen_t) sizeof(sa_all.sa_i4);
@@ -429,7 +430,8 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
memcpy (&(sa_all.sa_i6), s->bind_sa.v_sa, s->bind_sa.v_sa_len);
sk_port = (uint_least16_t) ntohs (sa_all.sa_i6.sin6_port);
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
- sa_all.sa_i6.sin6_len = (socklen_t) s->bind_sa.v_sa_len;
+ mhd_assert (sizeof(sa_all.sa_i6) == (uint8_t) sizeof(sa_all.sa_i6));
+ sa_all.sa_i6.sin6_len = (uint8_t) sizeof(sa_all.sa_i6);
#endif
p_use_sa = (struct sockaddr *) &(sa_all.sa_i6);
use_sa_size = (socklen_t) sizeof(sa_all.sa_i6);
@@ -478,7 +480,8 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
{
/* Fix embedded 'sa_len' member if possible */
memcpy (&sa_all, s->bind_sa.v_sa, s->bind_sa.v_sa_len);
- sa_all.sa_stor.ss_len = (socklen_t) s->bind_sa.v_sa_len;
+ mhd_assert (s->bind_sa.v_sa_len == (uint8_t) s->bind_sa.v_sa_len);
+ sa_all.sa_stor.ss_len = (uint8_t) s->bind_sa.v_sa_len;
p_use_sa = (const struct sockaddr *) &(sa_all.sa_stor);
}
else
@@ -600,12 +603,11 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
memset (&(sa_all.sa_i4), 0, sizeof(sa_all.sa_i4));
sa_all.sa_i4.sin_family = AF_INET;
sa_all.sa_i4.sin_port = htons (s->bind_port.v_port);
- if (0 == INADDR_ANY) /* Optimised at compile time */
- sa_all.sa_i4.sin_addr.s_addr = INADDR_ANY;
- else
+ sa_all.sa_i4.sin_addr.s_addr = INADDR_ANY;
+ if (0 != INADDR_ANY) /* Optimised at compile time */
sa_all.sa_i4.sin_addr.s_addr = htonl (INADDR_ANY);
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
- sa_all.sa_i4.sin_len = sizeof (sa_all.sa_i4);
+ sa_all.sa_i4.sin_len = (uint8_t) sizeof (sa_all.sa_i4);
#endif
p_use_sa = (const struct sockaddr *) &(sa_all.sa_i4);
use_sa_size = (socklen_t) sizeof (sa_all.sa_i4);
@@ -628,7 +630,7 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
sa_all.sa_i6.sin6_addr = static_in6any;
#endif
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
- sa_all.sa_i6.sin6_len = sizeof (sa_all.sa_i6);
+ sa_all.sa_i6.sin6_len = (uint8_t) sizeof (sa_all.sa_i6);
#endif
p_use_sa = (const struct sockaddr *) &(sa_all.sa_i6);
use_sa_size = (socklen_t) sizeof (sa_all.sa_i6);
diff --git a/src/mhd2/mhd_send.c b/src/mhd2/mhd_send.c
@@ -1067,7 +1067,10 @@ mhd_send_hdr_and_body (struct MHD_Connection *restrict connection,
msg.msg_flags = 0;
res = sendmsg (s, &msg, mhd_MSG_NOSIGNAL
- | ((push_hdr || push_body) ? 0 : mhd_MSG_MORE));
+# ifdef mhd_USE_MSG_MORE
+ | ((push_hdr || push_body) ? 0 : mhd_MSG_MORE)
+# endif
+ );
#elif defined(HAVE_WRITEV)
res = writev (s, vector, 2);
#endif /* HAVE_WRITEV */
@@ -1328,7 +1331,6 @@ mhd_send_sendfile (struct MHD_Connection *restrict c,
if (! sent_something)
{
- enum mhd_SocketError err;
if ((ENOTSUP == sk_err) ||
(EOPNOTSUPP == sk_err))
fallback_to_filereader = true;
@@ -1453,7 +1455,11 @@ send_iov_nontls (struct MHD_Connection *restrict connection,
pre_send_setopt (connection, true, push_data);
res = sendmsg (connection->sk.fd, &msg,
- mhd_MSG_NOSIGNAL | (push_data ? 0 : mhd_MSG_MORE));
+ mhd_MSG_NOSIGNAL
+# ifdef mhd_USE_MSG_MORE
+ | (push_data ? 0 : MSG_MORE)
+# endif
+ );
if (0 < res)
*sent = (size_t) res;
else
diff --git a/src/mhd2/request_get_info.c b/src/mhd2/request_get_info.c
@@ -171,7 +171,7 @@ MHD_request_get_info_dynamic_sz (
output_buf->v_number_uri_params_sizet =
MHD_request_get_values_cb (request,
MHD_VK_GET_ARGUMENT,
- NULL,
+ (MHD_NameValueIterator) NULL,
NULL);
return MHD_SC_OK;
case MHD_REQUEST_INFO_DYNAMIC_NUMBER_COOKIES:
@@ -195,7 +195,7 @@ MHD_request_get_info_dynamic_sz (
output_buf->v_number_cookies_sizet =
MHD_request_get_values_cb (request,
MHD_VK_COOKIE,
- NULL,
+ (MHD_NameValueIterator) NULL,
NULL);
return MHD_SC_OK;
#else
@@ -234,7 +234,7 @@ MHD_request_get_info_dynamic_sz (
output_buf->v_number_post_params_sizet =
MHD_request_get_values_cb (request,
MHD_VK_POSTDATA,
- NULL,
+ (MHD_NameValueIterator) NULL,
NULL);
return MHD_SC_OK;
#else
diff --git a/src/mhd2/response_from.c b/src/mhd2/response_from.c
@@ -198,7 +198,7 @@ MHD_response_from_buffer_copy (
{
new_buf = NULL;
buf_copy = empty_buf;
- res = response_create_basic (sc, 0, NULL, NULL);
+ res = response_create_basic (sc, 0, (MHD_FreeCallback) NULL, NULL);
}
if (NULL != res)
@@ -340,7 +340,7 @@ MHD_response_from_fd (enum MHD_HTTP_StatusCode sc,
if (size > ((size + offset) & 0xFFFFFFFFFFFFFFFFU))
return NULL;
}
- res = response_create_basic (sc, size, NULL, NULL);
+ res = response_create_basic (sc, size, (MHD_FreeCallback) NULL, NULL);
if (NULL != res)
{
res->cntn_dtype = mhd_RESPONSE_CONTENT_DATA_FILE;
@@ -361,7 +361,10 @@ MHD_response_from_pipe (enum MHD_HTTP_StatusCode sc,
int fd)
{
struct MHD_Response *restrict res;
- res = response_create_basic (sc, MHD_SIZE_UNKNOWN, NULL, NULL);
+ res = response_create_basic (sc,
+ MHD_SIZE_UNKNOWN,
+ (MHD_FreeCallback) NULL,
+ NULL);
if (NULL != res)
{
res->cntn_dtype = mhd_RESPONSE_CONTENT_DATA_FILE;
diff --git a/src/mhd2/stream_funcs.c b/src/mhd2/stream_funcs.c
@@ -979,7 +979,8 @@ mhd_conn_start_closing (struct MHD_Connection *restrict c,
mhd_LOG_MSG (c->daemon, sc, log_msg);
}
#else /* ! MHD_SUPPORT_LOG_FUNCTIONALITY */
- (void) log_msg;
+ (void) log_msg; /* Mute compiler warning */
+ (void) sc; /* Mute compiler warning */
#endif /* ! MHD_SUPPORT_LOG_FUNCTIONALITY */
#if 0 // TODO: notification callback
