diff --git a/dap-sdk/core/include/dap_common.h b/dap-sdk/core/include/dap_common.h
index d79e2d7b9b8f80e05ca359f8dd1002e5a17c6f47..aea85d7025556ecd154f718ae5ceac428f515586 100755
--- a/dap-sdk/core/include/dap_common.h
+++ b/dap-sdk/core/include/dap_common.h
@@ -205,12 +205,12 @@ DAP_STATIC_INLINE void _dap_aligned_free( void *ptr )
#define DAP_FORMAT_SOCKET "llu"
#else
#define DAP_FORMAT_SOCKET "lu"
-#endif
+#endif // _WIN64
#define DAP_FORMAT_HANDLE "p"
#else
#define DAP_FORMAT_SOCKET "d"
#define DAP_FORMAT_HANDLE "d"
-#endif
+#endif // DAP_OS_WINDOWS
#ifndef LOWORD
#define LOWORD( l ) ((uint16_t) (((uintptr_t) (l)) & 0xFFFF))
diff --git a/dap-sdk/core/include/dap_time.h b/dap-sdk/core/include/dap_time.h
index 686679b9f675b5cec0a9cc6059766152a6bc6144..d16e8b151e3f4724f9130d320f9eec30dfc4258b 100644
--- a/dap-sdk/core/include/dap_time.h
+++ b/dap-sdk/core/include/dap_time.h
@@ -1,11 +1,7 @@
#pragma once
#include <stdint.h>
#include <stddef.h>
-
-#ifdef DAP_OS_WINDOWS
-#define ctime_r(arg1, arg2) ctime_s(arg2, sizeof(arg2), arg1)
-//#define asctime_r(arg1, arg2) asctime_s(arg2, sizeof(arg2), arg1)
-#endif
+#include <time.h>
#define DAP_END_OF_DAYS 4102444799
// Constant to convert seconds to nanoseconds
diff --git a/dap-sdk/core/src/dap_file_utils.c b/dap-sdk/core/src/dap_file_utils.c
index 1fb7432921359848e264030ccdba32d1609aa779..f1635cbe175203fb0bcaadf63e0fc32e89b45d18 100755
--- a/dap-sdk/core/src/dap_file_utils.c
+++ b/dap-sdk/core/src/dap_file_utils.c
@@ -1691,7 +1691,7 @@ static bool s_tar_walk_directory(const char *a_start_path, const char *a_cur_pat
*/
bool dap_tar_directory(const char *a_inputdir, const char *a_output_tar_filename)
{
- int l_outfile = open(a_output_tar_filename, O_CREAT | O_WRONLY | O_BINARY);
+ int l_outfile = open(a_output_tar_filename, O_CREAT | O_WRONLY | O_BINARY, 0644);
if(l_outfile < 0) {
log_it(L_ERROR, "Failed to open output file");
return false;
diff --git a/dap-sdk/core/src/dap_time.c b/dap-sdk/core/src/dap_time.c
index 737cc477427b686bb4755dbca9e9ef40071db20e..393b8a140851f218a0f1bdb633eea23697dc01ca 100644
--- a/dap-sdk/core/src/dap_time.c
+++ b/dap-sdk/core/src/dap_time.c
@@ -176,7 +176,8 @@ int dap_gbd_time_to_str_rfc822(char *a_out, size_t a_out_size_max, dap_gdb_time_
* @param a_buf The minimum buffer size is 26 elements.
* @return
*/
-char* dap_ctime_r(dap_time_t *a_time, char* a_buf){
+char* dap_ctime_r(dap_time_t *a_time, char* a_buf)
+{
char *l_fail_ret = "(null)\r\n";
if (!a_buf)
return l_fail_ret;
@@ -185,6 +186,18 @@ char* dap_ctime_r(dap_time_t *a_time, char* a_buf){
return l_fail_ret;
}
struct tm l_time;
+#ifdef DAP_OS_WINDOWS
+ errno_t l_errno;
+ l_errno = localtime_s(&l_time, (time_t *)a_time);
+ if (!l_errno)
+ l_errno = asctime_s(a_buf, sizeof(l_time), &l_time);
+ if (!l_errno)
+ return a_buf;
+ else {
+ strcpy(a_buf, l_fail_ret);
+ return l_fail_ret;
+ }
+#else
localtime_r((time_t*)a_time, &l_time);
char *l_str_time = asctime_r(&l_time, a_buf);
if (l_str_time)
@@ -193,6 +206,7 @@ char* dap_ctime_r(dap_time_t *a_time, char* a_buf){
strcpy(a_buf, l_fail_ret);
return l_fail_ret;
}
+#endif
}
/**
diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c
index 0b50504d8ca8e5d466eba06cc4e388d9f40f7b29..549c451bf92138b7de754ea4b554b9ce09695f80 100644
--- a/dap-sdk/net/core/dap_events_socket.c
+++ b/dap-sdk/net/core/dap_events_socket.c
@@ -1198,7 +1198,7 @@ dap_events_socket_buf_item_t *l_item;
if ( !(l_item = DAP_NEW(dap_events_socket_buf_item_t)) ) /* Allocate new item - argument for new thread */
{
- log_it (L_ERROR, "[#%lu] No memory for new item, errno=%d, drop: a_es: %p, a_arg: %p",
+ log_it (L_ERROR, "[#%"DAP_UINT64_FORMAT_U"] No memory for new item, errno=%d, drop: a_es: %p, a_arg: %p",
atomic_load(&l_thd_count), errno, a_es, a_arg);
return;
}
@@ -1208,12 +1208,12 @@ dap_events_socket_buf_item_t *l_item;
if ( (l_rc = pthread_create(&l_thread, &s_attr_detached /* @RRL: #6157 */, dap_events_socket_buf_thread, l_item)) )
{
- log_it(L_ERROR, "[#%lu] Cannot start thread, drop a_es: %p, a_arg: %p, rc: %d",
+ log_it(L_ERROR, "[#%"DAP_UINT64_FORMAT_U"] Cannot start thread, drop a_es: %p, a_arg: %p, rc: %d",
atomic_load(&l_thd_count), a_es, a_arg, l_rc);
return;
}
- debug_if(g_debug_reactor, L_DEBUG, "[#%lu] Created thread %lx, a_es: %p, a_arg: %p",
+ debug_if(g_debug_reactor, L_DEBUG, "[#%"DAP_UINT64_FORMAT_U"] Created thread %"DAP_UINT64_FORMAT_x", a_es: %p, a_arg: %p",
atomic_load(&l_thd_count), l_thread, a_es, a_arg);
}
diff --git a/dap-sdk/net/server/http_server/http_client/dap_http_client.c b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
index 7b782dc75b0cd2c9eb15646a3722fbdc158c9312..ccb3e29468aef9a4de887dd6730c82e46ab84067 100644
--- a/dap-sdk/net/server/http_server/http_client/dap_http_client.c
+++ b/dap-sdk/net/server/http_server/http_client/dap_http_client.c
@@ -385,7 +385,7 @@ void dap_http_client_read( dap_events_socket_t *a_esocket, void *a_arg )
if ( strstr(l_query_string, "HTTP/1.1") ){
//Search for the first occurrence.
int i = 0;
- for (; i < strlen(l_query_string); i++){
+ for (; i < (int)strlen(l_query_string); i++){
if (l_query_string[i] == ' '){
break;
}
diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c
index 7d5595222bc3aec14604df784d575c8bb0c4dc34..a2eb60902bb281968e7caaee80059aed22057be6 100644
--- a/modules/chain/dap_chain_ledger.c
+++ b/modules/chain/dap_chain_ledger.c
@@ -3203,7 +3203,7 @@ unsigned dap_chain_ledger_count(dap_ledger_t *a_ledger)
* @param a_ts_to
* @return
*/
-uint64_t dap_chain_ledger_count_from_to(dap_ledger_t * a_ledger, time_t a_ts_from, time_t a_ts_to )
+uint64_t dap_chain_ledger_count_from_to(dap_ledger_t * a_ledger, dap_time_t a_ts_from, dap_time_t a_ts_to)
{
uint64_t l_ret = 0;
dap_ledger_private_t *l_ledger_priv = PVT(a_ledger);
diff --git a/modules/chain/include/dap_chain_ledger.h b/modules/chain/include/dap_chain_ledger.h
index 332621bb902d90a0a1e50f1a47d68644f5e171c7..58de1e208f5a630c60e821c291275435cca9452a 100644
--- a/modules/chain/include/dap_chain_ledger.h
+++ b/modules/chain/include/dap_chain_ledger.h
@@ -176,7 +176,7 @@ void dap_chain_ledger_load_end(dap_ledger_t *a_ledger);
*/
unsigned dap_chain_ledger_count(dap_ledger_t *a_ledger);
-uint64_t dap_chain_ledger_count_from_to(dap_ledger_t * a_ledger, time_t a_ts_from, time_t a_ts_to );
+uint64_t dap_chain_ledger_count_from_to(dap_ledger_t * a_ledger, dap_time_t a_ts_from, dap_time_t a_ts_to);
size_t dap_chain_ledger_count_tps(dap_ledger_t *a_ledger, struct timespec *a_ts_from, struct timespec *a_ts_to);
/**
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 443f0fc6179ff21ee534f8ebc90afee5f16b906f..0bc5487ba337da52f839c455d7dd65c532438e5f 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -2271,7 +2271,7 @@ void s_com_mempool_list_print_for_chain(dap_chain_net_t * a_net, dap_chain_t * a
dap_chain_datum_t * l_datum = (dap_chain_datum_t*) l_objs[i].value;
dap_time_t l_ts_create = (dap_time_t) l_datum->header.ts_create;
if (!l_datum->header.data_size || (l_datum->header.data_size > l_objs[i].value_len)) {
- log_it(L_ERROR, "Trash datum in GDB %s.%s, key: %s data_size:%u, value_len:%u",
+ log_it(L_ERROR, "Trash datum in GDB %s.%s, key: %s data_size:%u, value_len:%zu",
a_net->pub.name, a_chain->name, l_objs[i].key, l_datum->header.data_size, l_objs[i].value_len);
continue;
}