From df7e4904d3dd9b54b501cae2b951b9ba241b659d Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Mon, 20 May 2024 12:15:07 +0700
Subject: [PATCH] [*] Some compiler warnings fix
---
modules/chain/dap_chain.c | 4 ++--
modules/chain/dap_chain_ch.c | 18 +++++++++---------
modules/chain/dap_chain_ch_pkt.c | 6 +++---
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 6 +++---
modules/net/dap_chain_net.c | 4 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c
index 2a2d7907a8..cc62a48ac5 100644
--- a/modules/chain/dap_chain.c
+++ b/modules/chain/dap_chain.c
@@ -739,7 +739,7 @@ ssize_t dap_chain_atom_save(dap_chain_cell_t *a_chain_cell, const uint8_t *a_ato
dap_chain_atom_notifier_t *l_notifier = (dap_chain_atom_notifier_t*)l_iter->data;
struct chain_thread_notifier *l_arg = DAP_NEW_Z(struct chain_thread_notifier);
if (!l_arg) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
continue;
}
*l_arg = (struct chain_thread_notifier) { .callback = l_notifier->callback, .callback_arg = l_notifier->arg,
@@ -747,7 +747,7 @@ ssize_t dap_chain_atom_save(dap_chain_cell_t *a_chain_cell, const uint8_t *a_ato
l_arg->atom = DAP_DUP_SIZE(a_atom, a_atom_size);
if (!l_arg->atom) {
DAP_DELETE(l_arg);
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
continue;
}
dap_proc_thread_callback_add_pri(NULL, s_notify_atom_on_thread, l_arg, DAP_QUEUE_MSG_PRIORITY_LOW);
diff --git a/modules/chain/dap_chain_ch.c b/modules/chain/dap_chain_ch.c
index cd9cc9923d..76f1e6cf36 100644
--- a/modules/chain/dap_chain_ch.c
+++ b/modules/chain/dap_chain_ch.c
@@ -306,7 +306,7 @@ struct legacy_sync_context *s_legacy_sync_context_create(dap_chain_ch_pkt_t *a_c
};
dap_stream_ch_uuid_t *l_uuid = DAP_DUP(&a_ch->uuid);
if (!l_uuid) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
DAP_DELETE(l_context);
return NULL;
}
@@ -399,7 +399,7 @@ static bool s_sync_out_gdb_proc_callback(void *a_arg)
l_data_size = dap_list_length(l_list_out) * sizeof(dap_chain_ch_update_element_t);
l_data = DAP_NEW_Z_SIZE(dap_chain_ch_update_element_t, l_data_size);
if (!l_data) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
l_context->state = DAP_CHAIN_CH_STATE_ERROR;
goto context_delete;
}
@@ -439,7 +439,7 @@ static bool s_sync_out_gdb_proc_callback(void *a_arg)
}
l_pkt_pack = dap_global_db_pkt_pack_old(l_pkt_pack, l_pkt);
if (!l_pkt_pack || l_cur_size == l_pkt_pack->data_size) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
l_context->state = DAP_CHAIN_CH_STATE_ERROR;
goto context_delete;
}
@@ -533,7 +533,7 @@ static bool s_sync_out_chains_proc_callback(void *a_arg)
if (l_cur_state == DAP_CHAIN_CH_STATE_UPDATE_CHAINS) {
l_hashes = DAP_NEW_Z_SIZE(dap_chain_ch_update_element_t, s_update_pack_size * sizeof(dap_chain_ch_update_element_t));
if (!l_hashes) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
l_context->state = DAP_CHAIN_CH_STATE_ERROR;
goto context_delete;
}
@@ -705,7 +705,7 @@ static void s_gossip_payload_callback(void *a_payload, size_t a_payload_size, da
}
struct atom_processing_args *l_args = DAP_NEW_SIZE(struct atom_processing_args, a_payload_size + sizeof(struct atom_processing_args));
if (!l_args) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return;
}
l_args->addr = a_sender_addr;
@@ -798,7 +798,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
}
struct atom_processing_args *l_args = DAP_NEW_SIZE(struct atom_processing_args, l_ch_pkt->hdr.data_size + sizeof(struct atom_processing_args));
if (!l_args) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
break;
}
l_args->addr = a_ch->stream->node;
@@ -886,7 +886,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
atomic_store(&l_context->allowed_num, l_sum.num_cur + s_sync_ack_window_size);
dap_stream_ch_uuid_t *l_uuid = DAP_DUP(&a_ch->uuid);
if (!l_uuid) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
DAP_DELETE(l_context);
break;
}
@@ -1260,7 +1260,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
DAP_NEW_Z_RET_VAL(l_args, struct record_processing_args, true, NULL);
l_args->pkt = DAP_DUP_SIZE(l_pkt, l_chain_pkt_data_size);
if (!l_args->pkt) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
dap_stream_ch_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id,
l_chain_pkt->hdr.chain_id, l_chain_pkt->hdr.cell_id,
DAP_CHAIN_CH_ERROR_OUT_OF_MEMORY);
@@ -1512,7 +1512,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
debug_if(s_debug_legacy, L_INFO, "In: CHAIN_OLD data_size=%zu", l_chain_pkt_data_size);
struct atom_processing_args *l_args = DAP_NEW_Z_SIZE(struct atom_processing_args, l_ch_pkt->hdr.data_size + sizeof(struct atom_processing_args));
if (!l_args) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
dap_stream_ch_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id,
l_chain_pkt->hdr.chain_id, l_chain_pkt->hdr.cell_id,
DAP_CHAIN_CH_ERROR_OUT_OF_MEMORY);
diff --git a/modules/chain/dap_chain_ch_pkt.c b/modules/chain/dap_chain_ch_pkt.c
index c4d42a196f..e774210cf2 100644
--- a/modules/chain/dap_chain_ch_pkt.c
+++ b/modules/chain/dap_chain_ch_pkt.c
@@ -57,7 +57,7 @@ size_t dap_chain_ch_pkt_write_unsafe(dap_stream_ch_t *a_ch, uint8_t a_type,
: DAP_NEW_STACK_SIZE(dap_chain_ch_pkt_t, l_chain_pkt_size);
if (!l_chain_pkt) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return 0;
}
s_chain_pkt_fill(l_chain_pkt, a_net_id, a_chain_id, a_cell_id, a_data, a_data_size, a_version);
@@ -76,7 +76,7 @@ dap_chain_ch_pkt_t *dap_chain_ch_pkt_new(dap_chain_net_id_t a_net_id, dap_chain_
if (l_chain_pkt)
s_chain_pkt_fill(l_chain_pkt, a_net_id, a_chain_id, a_cell_id, a_data, a_data_size, a_version);
else
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return l_chain_pkt;
}
/**
@@ -101,7 +101,7 @@ size_t dap_chain_ch_pkt_write_mt(dap_stream_worker_t *a_worker, dap_stream_ch_uu
: DAP_NEW_STACK_SIZE(dap_chain_ch_pkt_t, l_chain_pkt_size);
if (!l_chain_pkt) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return 0;
}
s_chain_pkt_fill(l_chain_pkt, a_net_id, a_chain_id, a_cell_id, a_data, a_data_size, a_version);
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 5a74043e2b..c217881212 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -1684,7 +1684,7 @@ void s_session_sync_queue_add(dap_chain_esbocs_session_t *a_session, dap_chain_e
void *l_message_copy = DAP_DUP_SIZE(a_message, a_message_size);
if (!l_message_copy) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return;
}
dap_chain_esbocs_sync_item_t *l_sync_item;
@@ -1971,7 +1971,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t *a_ch, void *a_arg)
NODE_ADDR_FP_ARGS_S(a_ch->stream->node), NODE_ADDR_FP_ARGS_S(l_session->my_addr));
struct esbocs_msg_args *l_args = DAP_NEW_SIZE(struct esbocs_msg_args, sizeof(struct esbocs_msg_args) + l_message_size);
if (!l_args) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return false;
}
l_args->addr_from = a_ch->stream->node;
@@ -2508,7 +2508,7 @@ static void s_message_send(dap_chain_esbocs_session_t *a_session, uint8_t a_mess
struct esbocs_msg_args *l_args = DAP_NEW_SIZE(struct esbocs_msg_args,
sizeof(struct esbocs_msg_args) + l_message_size + l_sign_size);
if (!l_args) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return;
}
l_args->addr_from = a_session->my_addr;
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 78965d2c38..243726eb77 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2411,7 +2411,7 @@ static void s_ch_in_pkt_callback(dap_stream_ch_t *a_ch, uint8_t a_type, const vo
: c_dap_chain_cell_id_null,
NULL);
if (!l_iter) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
dap_stream_ch_write_error_unsafe(a_ch, l_net->pub.id,
l_net_pvt->sync_context.cur_chain->id,
l_net_pvt->sync_context.cur_cell
@@ -2545,7 +2545,7 @@ static void s_sync_timer_callback(void *a_arg)
l_net_pvt->sync_context.cur_cell ? l_net_pvt->sync_context.cur_cell->id : c_dap_chain_cell_id_null,
&l_request, sizeof(l_request), DAP_CHAIN_CH_PKT_VERSION_CURRENT);
if (!l_chain_pkt) {
- log_it(L_CRITICAL, g_error_memory_alloc);
+ log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return;
}
log_it(L_INFO, "Start synchronization process with " NODE_ADDR_FP_STR
--
GitLab