From c44dcde6cb65c78a6e6a81a839175ef864e9e13c Mon Sep 17 00:00:00 2001
From: Dmtiriy Gerasimov <naeper@demlabs.net>
Date: Sun, 12 May 2019 17:09:50 +0700
Subject: [PATCH] [*] Lot of warnings fixes
---
client_mempool.c | 2 +-
dap_chain_mempool.c | 6 +++---
dap_chain_mempool.h | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/client_mempool.c b/client_mempool.c
index bc11f73..785857d 100755
--- a/client_mempool.c
+++ b/client_mempool.c
@@ -259,7 +259,7 @@ static int client_mempool_send_request(client_mempool_t *mempool, dap_datum_memp
size_t a_request_size = 1;
uint8_t *a_request = (datum_mempool) ? dap_datum_mempool_serialize(datum_mempool, &a_request_size) : (uint8_t*) " ";
uint8_t *a_request_out = DAP_NEW_Z_SIZE(uint8_t, a_request_size * 2); // a_request + 1 byte for type action
- bin2hex(a_request_out, a_request, a_request_size);
+ dap_bin2hex(a_request_out, a_request, a_request_size);
client_mempool_reset(mempool, CLIENT_MEMPOOL_SEND);
dap_client_pvt_t * l_client_internal = DAP_CLIENT_PVT(mempool->a_client);
l_client_internal->is_close_session = is_last_req;
diff --git a/dap_chain_mempool.c b/dap_chain_mempool.c
index e100037..691c2ec 100755
--- a/dap_chain_mempool.c
+++ b/dap_chain_mempool.c
@@ -67,7 +67,7 @@ typedef struct list_used_item {
const char* c_dap_datum_mempool_gdb_group = NULL;
-int dap_datum_mempool_init()
+int dap_datum_mempool_init(void)
{
c_dap_datum_mempool_gdb_group = dap_config_get_item_str_default(g_config, "mempool", "gdb_group", "datum-pool");
return 0;
@@ -595,7 +595,7 @@ void chain_mempool_proc(struct dap_http_simple *cl_st, void * arg)
* @param sh HTTP server instance
* @param url URL string
*/
-void dap_chain_mempool_add_proc(struct dap_http * sh, const char * url)
+void dap_chain_mempool_add_proc(dap_http_t * a_http_server, const char * a_url)
{
- dap_http_simple_proc_add(sh, url, 4096, chain_mempool_proc);
+ dap_http_simple_proc_add(a_http_server, a_url, 4096, chain_mempool_proc);
}
diff --git a/dap_chain_mempool.h b/dap_chain_mempool.h
index 21feffb..e74cebf 100755
--- a/dap_chain_mempool.h
+++ b/dap_chain_mempool.h
@@ -2,6 +2,7 @@
#include <stdint.h>
#include "dap_chain_datum.h"
+#include "dap_http.h"
/*
// datum mempool structure
typedef struct dap_datum_mempool {
@@ -28,7 +29,7 @@ typedef struct dap_datum_mempool {
dap_chain_datum_t **data;// mass of datums
}DAP_ALIGN_PACKED dap_datum_mempool_t;
-int dap_datum_mempool_init();
+int dap_datum_mempool_init(void);
extern const char* c_dap_datum_mempool_gdb_group;
@@ -38,7 +39,7 @@ dap_datum_mempool_t * dap_datum_mempool_deserialize(uint8_t *datum_mempool_str,
void dap_datum_mempool_clean(dap_datum_mempool_t *datum);
void dap_datum_mempool_free(dap_datum_mempool_t *datum);
-void dap_chain_mempool_add_proc(struct dap_http * sh, const char * url);
+void dap_chain_mempool_add_proc(dap_http_t * a_http_server, const char * a_url);
int dap_chain_mempool_tx_create(dap_enc_key_t *a_key_from,
const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_to, const dap_chain_addr_t* a_addr_fee,
--
GitLab