From 20c1761f9280e2d643deaa344185e06e7cefa24e Mon Sep 17 00:00:00 2001
From: "Constantin P." <papizh.konstantin@demlabs.net>
Date: Tue, 15 Oct 2024 06:37:49 +0000
Subject: [PATCH] Hotfix warnings
---
io/dap_events_socket.c | 19 ++--------
io/dap_server.c | 2 +-
io/dap_worker.c | 38 ++++++-------------
.../http_server/http_client/dap_http_client.c | 4 +-
net/stream/stream/dap_stream.c | 2 +-
5 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/io/dap_events_socket.c b/io/dap_events_socket.c
index 81795de3c..7598e9b4f 100644
--- a/io/dap_events_socket.c
+++ b/io/dap_events_socket.c
@@ -809,13 +809,9 @@ void dap_events_socket_event_proc_input_unsafe(dap_events_socket_t *a_esocket)
eventfd_t l_value;
if(eventfd_read( a_esocket->fd, &l_value)==0 ){ // would block if not ready
a_esocket->callbacks.event_callback(a_esocket, l_value);
- }else if ( (errno != EAGAIN) && (errno != EWOULDBLOCK) ){ // we use blocked socket for now but who knows...
- int l_errno = errno;
- char l_errbuf[128];
- l_errbuf[0]=0;
- strerror_r(l_errno, l_errbuf, sizeof (l_errbuf));
- log_it(L_WARNING, "Can't read packet from event fd: \"%s\"(%d)", l_errbuf, l_errno);
- }else
+ }else if ( (errno != EAGAIN) && (errno != EWOULDBLOCK) )
+ log_it(L_WARNING, "Can't read packet from event fd, error %d: \"%s\"", errno, dap_strerror(errno));
+ else
return; // do nothing
#elif defined DAP_EVENTS_CAPS_WEPOLL
u_short l_value;
@@ -1668,14 +1664,7 @@ int dap_events_socket_queue_ptr_send( dap_events_socket_t *a_es, void *a_arg)
#else
#error "Not implemented dap_events_socket_queue_ptr_send() for this platform"
#endif
- if(l_ret == sizeof(a_arg) )
- return 0;
- else{
- char l_errbuf[128];
- strerror_r(l_errno, l_errbuf, sizeof (l_errbuf));
- log_it(L_ERROR,"Send queue ptr error: \"%s\" code %d", l_errbuf, l_errno);
- return l_errno;
- }
+ return l_ret == sizeof(a_arg) ? 0 : ( log_it(L_ERROR,"Send queue ptr error %d: \"%s\"", l_errno, dap_strerror(l_errno)), l_errno );
}
#endif
diff --git a/io/dap_server.c b/io/dap_server.c
index a396b336d..48c1e0674 100644
--- a/io/dap_server.c
+++ b/io/dap_server.c
@@ -310,7 +310,7 @@ static void s_es_server_new(dap_events_socket_t *a_es, void * a_arg)
*/
static void s_es_server_error(dap_events_socket_t *a_es, int a_errno)
{
- log_it(L_WARNING, "Server socket %d error %d: %s", a_errno, dap_strerror(a_errno));
+ log_it(L_WARNING, "Server socket %d error %d: %s", a_es->socket, a_errno, dap_strerror(a_errno));
}
/**
diff --git a/io/dap_worker.c b/io/dap_worker.c
index 3e5871bdf..2f7810788 100644
--- a/io/dap_worker.c
+++ b/io/dap_worker.c
@@ -487,13 +487,11 @@ void dap_worker_add_events_socket(dap_worker_t *a_worker, dap_events_socket_t *a
? s_queue_es_add(a_worker->queue_es_new, a_events_socket)
: dap_events_socket_queue_ptr_send(a_worker->queue_es_new, a_events_socket);
- if (l_ret) {
- char l_errbuf[128] = { '\0' };
- strerror_r(l_ret, l_errbuf, sizeof(l_errbuf));
+ if (l_ret)
log_it(L_ERROR, dap_worker_get_current() == a_worker
? "Can't assign esocket to worker: \"%s\"(code %d)"
- : "Can't send pointer in queue: \"%s\"(code %d)", l_errbuf, l_ret);
- } else
+ : "Can't send pointer in queue: \"%s\"(code %d)", dap_strerror(l_ret), l_ret);
+ else
debug_if(g_debug_reactor, L_DEBUG,
"Sent es %p \"%s\" [%s] to worker #%d",
a_events_socket, dap_events_socket_get_type_str(a_events_socket),
@@ -511,13 +509,9 @@ void dap_worker_add_events_socket(dap_worker_t *a_worker, dap_events_socket_t *a
void dap_worker_add_events_socket_inter(dap_events_socket_t *a_es_input, dap_events_socket_t *a_events_socket)
{
dap_return_if_fail(a_es_input && a_events_socket);
- if( dap_events_socket_queue_ptr_send_to_input( a_es_input, a_events_socket ) != 0 ){
- int l_errno = errno;
- char l_errbuf[128];
- *l_errbuf = 0;
- strerror_r(l_errno,l_errbuf,sizeof (l_errbuf));
- log_it(L_ERROR, "Cant send pointer to interthread queue input: \"%s\"(code %d)", l_errbuf, l_errno);
- }
+ if( dap_events_socket_queue_ptr_send_to_input( a_es_input, a_events_socket ) )
+ log_it(L_ERROR, "Cant send pointer to interthread queue input: \"%s\"(code %d)",
+ dap_strerror(errno), errno);
}
/**
@@ -536,13 +530,9 @@ void dap_worker_exec_callback_inter(dap_events_socket_t * a_es_input, dap_worker
}
l_msg->callback = a_callback;
l_msg->arg = a_arg;
- int l_ret=dap_events_socket_queue_ptr_send_to_input (a_es_input ,l_msg );
- if(l_ret != 0 ){
- char l_errbuf[128];
- *l_errbuf = 0;
- strerror_r(l_ret,l_errbuf,sizeof (l_errbuf));
- log_it(L_ERROR, "Cant send pointer in queue input: \"%s\"(code %d)", l_errbuf, l_ret);
- }
+ if ( dap_events_socket_queue_ptr_send_to_input (a_es_input ,l_msg ) )
+ log_it(L_ERROR, "Cant send pointer to queue input: \"%s\"(code %d)",
+ dap_strerror(errno), errno);
}
#endif
@@ -559,13 +549,9 @@ void dap_worker_exec_callback_on(dap_worker_t * a_worker, dap_worker_callback_t
return;
}
*l_msg = (dap_worker_msg_callback_t) { .callback = a_callback, .arg = a_arg };
- int l_ret = dap_events_socket_queue_ptr_send( a_worker->queue_callback, l_msg );
- if (l_ret) {
- char l_errbuf[128];
- *l_errbuf = 0;
- strerror_r(l_ret,l_errbuf,sizeof (l_errbuf));
- log_it(L_ERROR, "Cant send pointer in queue: \"%s\"(code %d)", l_errbuf, l_ret);
- }
+ if ( dap_events_socket_queue_ptr_send( a_worker->queue_callback, l_msg ) )
+ log_it(L_ERROR, "Cant send pointer to queue input: \"%s\"(code %d)",
+ dap_strerror(errno), errno);
}
diff --git a/net/server/http_server/http_client/dap_http_client.c b/net/server/http_server/http_client/dap_http_client.c
index 36a5ceab5..a8db7e472 100644
--- a/net/server/http_server/http_client/dap_http_client.c
+++ b/net/server/http_server/http_client/dap_http_client.c
@@ -368,7 +368,7 @@ void dap_http_client_read( dap_events_socket_t *a_esocket, void *a_arg )
/* Parse HTTP's start-line */
if ( 0 > s_http_start_line_parse(l_http_client, (char *) a_esocket->buf_in, l_len) ) {
- log_it( L_WARNING, "Error parsing request line '%.*s'", l_len, a_esocket->buf_in );
+ log_it( L_WARNING, "Error parsing request line '%.*s'", (int)l_len, a_esocket->buf_in );
s_report_error_and_restart( a_esocket, l_http_client, Http_Status_BadRequest );
break;
}
@@ -460,7 +460,7 @@ void dap_http_client_read( dap_events_socket_t *a_esocket, void *a_arg )
l_len = l_peol - a_esocket->buf_in;
if ( 0 > (l_ret = dap_http_header_parse( l_http_client, (char *) a_esocket->buf_in, l_len )) ) {
- log_it( L_WARNING, "Input: not a valid header '%.*s'", l_len, a_esocket->buf_in );
+ log_it( L_WARNING, "Input: not a valid header '%.*s'", (int)l_len, a_esocket->buf_in );
}else if ( l_ret == 1 ) {
log_it( L_INFO, "Input: HTTP headers are over" );
diff --git a/net/stream/stream/dap_stream.c b/net/stream/stream/dap_stream.c
index 6493ed7d2..77c1a62f7 100644
--- a/net/stream/stream/dap_stream.c
+++ b/net/stream/stream/dap_stream.c
@@ -683,7 +683,7 @@ size_t dap_stream_data_proc_read (dap_stream_t *a_stream)
if ( !memcmp(l_pos, c_dap_stream_sig, sizeof(c_dap_stream_sig)) ) {
dap_stream_pkt_t *l_pkt = (dap_stream_pkt_t*)l_pos;
if (l_pkt->hdr.size > DAP_STREAM_PKT_SIZE_MAX) {
- log_it(L_ERROR, "Invalid packet size %lu, dump it", l_pkt->hdr.size);
+ log_it(L_ERROR, "Invalid packet size %u, dump it", l_pkt->hdr.size);
l_shift = sizeof(dap_stream_pkt_hdr_t);
} else if ( (l_shift = sizeof(dap_stream_pkt_hdr_t) + l_pkt->hdr.size) <= (size_t)(l_end - l_pos) ) {
debug_if(s_dump_packet_headers, L_DEBUG, "Processing full packet, size %lu", l_shift);
--
GitLab