From 3e1de5a9bfa679c06933bb88473a401f680affe3 Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Sun, 9 Sep 2018 20:28:43 +0700 Subject: [PATCH] [*] Build errors, renames --- dap_chain_net_srv.c | 32 ++++++++++++++++---------------- dap_chain_net_srv.h | 24 ++++++++++++------------ dap_chain_net_srv_pkt.c | 4 ++-- dap_chain_net_srv_pkt.h | 8 ++++---- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dap_chain_net_srv.c b/dap_chain_net_srv.c index 79e9ea1..54fa3fa 100644 --- a/dap_chain_net_srv.c +++ b/dap_chain_net_srv.c @@ -24,65 +24,65 @@ #include "utlist.h" -#include "dap_chain_srv.h" +#include "dap_chain_net_srv.h" -#define LOG_TAG "chain_srv" +#define LOG_TAG "chain_net_srv" size_t m_uid_count; -dap_chain_srv_uid_t * m_uid; +dap_chain_net_srv_uid_t * m_uid; /** - * @brief dap_chain_srv_init + * @brief dap_chain_net_srv_init * @return */ -int dap_chain_srv_init() +int dap_chain_net_srv_init() { m_uid = NULL; - m_uid_count = NULL; + m_uid_count = 0; return 0; } /** - * @brief dap_chain_srv_deinit + * @brief dap_chain_net_srv_deinit */ -void dap_chain_srv_deinit() +void dap_chain_net_srv_deinit() { } /** - * @brief dap_chain_srv_add + * @brief dap_chain_net_srv_add * @param a_srv */ -void dap_chain_srv_add(dap_chain_srv_t * a_srv) +void dap_chain_net_srv_add(dap_chain_net_srv_t * a_srv) { } /** - * @brief dap_chain_srv_get + * @brief dap_chain_net_srv_get * @param a_uid * @return */ -dap_chain_srv_t * dap_chain_srv_get( dap_chain_srv_uid_t a_uid) +dap_chain_net_srv_t * dap_chain_net_srv_get( dap_chain_net_srv_uid_t a_uid) { } /** - * @brief dap_chain_srv_count + * @brief dap_chain_net_srv_count * @return */ -const size_t dap_chain_srv_count() +const size_t dap_chain_net_srv_count() { } /** - * @brief dap_chain_srv_list + * @brief dap_chain_net_srv_list * @return */ -const dap_chain_srv_uid_t * dap_chain_srv_list() +const dap_chain_net_srv_uid_t * dap_chain_net_srv_list() { } diff --git a/dap_chain_net_srv.h b/dap_chain_net_srv.h index 780be5f..95ea139 100644 --- a/dap_chain_net_srv.h +++ b/dap_chain_net_srv.h @@ -23,23 +23,23 @@ */ #pragma once -#include "dap_chain_node.h" -#include "dap_chain_srv_pkt.h" +#include "dap_chain_net_node.h" +#include "dap_chain_net_srv_pkt.h" -typedef struct dap_chain_srv +typedef struct dap_chain_net_srv { - dap_chain_node_t * node; - dap_chain_srv_uid_t uid; // Unique ID for service. + dap_chain_net_node_t * node; + dap_chain_net_srv_uid_t uid; // Unique ID for service. void * _internal; void * _inhertor; -} dap_chain_srv_t; +} dap_chain_net_srv_t; -int dap_chain_srv_init(); -void dap_chain_srv_deinit(); +int dap_chain_net_srv_init(); +void dap_chain_net_srv_deinit(); -void dap_chain_srv_add(dap_chain_srv_t * a_srv); -dap_chain_srv_t * dap_chain_srv_get( dap_chain_srv_uid_t a_uid); -const size_t dap_chain_srv_count(); -const dap_chain_srv_uid_t * dap_chain_srv_list(); +void dap_chain_net_srv_add(dap_chain_net_srv_t * a_srv); +dap_chain_net_srv_t * dap_chain_net_srv_get( dap_chain_net_srv_uid_t a_uid); +const size_t dap_chain_net_srv_count(); +const dap_chain_net_srv_uid_t * dap_chain_net_srv_list(); diff --git a/dap_chain_net_srv_pkt.c b/dap_chain_net_srv_pkt.c index e7e590f..81f7256 100644 --- a/dap_chain_net_srv_pkt.c +++ b/dap_chain_net_srv_pkt.c @@ -1,3 +1,3 @@ -#include "dap_chain_srv_pkt.h" +#include "dap_chain_net_srv_pkt.h" -#define LOG_TAG "srv_pkt" +#define LOG_TAG "chain_net_srv_pkt" diff --git a/dap_chain_net_srv_pkt.h b/dap_chain_net_srv_pkt.h index 0e731fb..264a613 100644 --- a/dap_chain_net_srv_pkt.h +++ b/dap_chain_net_srv_pkt.h @@ -26,10 +26,10 @@ #include <stdint.h> -typedef uint64_t dap_chain_srv_uid_t; -typedef struct dap_chain_srv_pkt{ +typedef uint64_t dap_chain_net_srv_uid_t; +typedef struct dap_chain_net_srv_pkt{ struct { - dap_chain_srv_uid_t uid; + dap_chain_net_srv_uid_t uid; } __attribute__((packed)) header ; uint8_t data[]; -} __attribute__((packed)) dap_chain_srv_pkt_t; +} __attribute__((packed)) dap_chain_net_srv_pkt_t; -- GitLab