From b070c0b8cd5f46dd3943a4269da3ea3908f4e08d Mon Sep 17 00:00:00 2001
From: "Constantin P." <papizh.konstantin@demlabs.net>
Date: Mon, 27 Jan 2025 14:18:23 +0700
Subject: [PATCH] Compile errors and warnings fixed
---
dap-sdk | 2 +-
modules/net/dap_chain_net_tx.c | 2 +-
modules/service/xchange/dap_chain_net_srv_xchange.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index d4625a8ff5..db40377b1d 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit d4625a8ff516b067d43a2c007e1ec73470600803
+Subproject commit db40377b1d32d141e4e59bf0fa830a6b462fd9c2
diff --git a/modules/net/dap_chain_net_tx.c b/modules/net/dap_chain_net_tx.c
index 90e239b626..b6a7cb2fe4 100644
--- a/modules/net/dap_chain_net_tx.c
+++ b/modules/net/dap_chain_net_tx.c
@@ -1212,7 +1212,7 @@ int dap_chain_net_tx_create_by_json(json_object *a_tx_json, dap_chain_net_t *a_n
};
debug_if(l_sign_size && l_tx_sig->header.sig_size != l_sign_size, L_ERROR,
- "Json TX: sign size mismatch, %zu != %zu!", l_sign_size, l_tx_sig->header.sig_size);
+ "Json TX: sign size mismatch, %zu != %u!", l_sign_size, l_tx_sig->header.sig_size);
/* But who cares?... */
size_t l_tx_size = dap_chain_datum_tx_get_size(l_tx), l_tx_items_size = l_tx->header.tx_items_size;
l_tx->header.tx_items_size = 0;
diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c
index 234d5cff80..50f479b8b0 100644
--- a/modules/service/xchange/dap_chain_net_srv_xchange.c
+++ b/modules/service/xchange/dap_chain_net_srv_xchange.c
@@ -2275,7 +2275,7 @@ static bool s_string_append_tx_cond_info_json(json_object * a_json_out, dap_chai
switch(l_tx_type){
case TX_TYPE_ORDER:{
if (!l_out_cond_item)
- log_it(L_ERROR, "Can't find conditional output in TX %s", l_tx_hash_str), false;
+ return log_it(L_ERROR, "Can't find conditional output in TX %s", l_tx_hash_str), false;
json_object_object_add(a_json_out, "hash", json_object_new_string(l_tx_hash_str));
if (a_print_ts){
--
GitLab