diff --git a/src/datastruct/chain/chain_node.c b/src/datastruct/chain/chain_node.c index 25e501e..18b1110 100644 --- a/src/datastruct/chain/chain_node.c +++ b/src/datastruct/chain/chain_node.c @@ -9,8 +9,8 @@ @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithInt(int m_int, _Bool if_sid) { - Node *p_node; +CNode *nodeWithInt(int m_int, _Bool if_sid) { + CNode *p_node; int *p_int = (int *)malloc(sizeof(int)); if(p_int == NULL){ return NULL; @@ -29,8 +29,8 @@ Node *nodeWithInt(int m_int, _Bool if_sid) { @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithUInt(uint32_t m_uint, _Bool if_sid){ - Node *p_node; +CNode *nodeWithUInt(uint32_t m_uint, _Bool if_sid){ + CNode *p_node; unsigned int *pu_int = (uint32_t *)malloc(sizeof(uint32_t)); if(pu_int == NULL){ return NULL; @@ -49,8 +49,8 @@ Node *nodeWithUInt(uint32_t m_uint, _Bool if_sid){ @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithULLInt(uint64_t m_ullint, _Bool if_sid) { - Node *p_node; +CNode *nodeWithULLInt(uint64_t m_ullint, _Bool if_sid) { + CNode *p_node; unsigned long long *p_ullint = (uint64_t *)malloc(sizeof(uint64_t)); if(p_ullint == NULL){ return NULL; @@ -69,8 +69,8 @@ Node *nodeWithULLInt(uint64_t m_ullint, _Bool if_sid) { @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithDouble(double m_double, _Bool if_sid) { - Node *p_node; +CNode *nodeWithDouble(double m_double, _Bool if_sid) { + CNode *p_node; double *p_double = (double *)malloc(sizeof(double)); if(p_double == NULL){ return NULL; @@ -89,8 +89,8 @@ Node *nodeWithDouble(double m_double, _Bool if_sid) { @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithString(const char *m_string, _Bool if_sid) { - Node *p_node; +CNode *nodeWithString(const char *m_string, _Bool if_sid) { + CNode *p_node; char *p_string = (char *)malloc(sizeof(char)*(strlen(m_string) + 1)); if(p_string == NULL){ return NULL; @@ -109,8 +109,8 @@ Node *nodeWithString(const char *m_string, _Bool if_sid) { @param if_sid 新的节点有无id @return 返回指向新节点的指针 */ -Node *nodeWithPointer(const void *m_pointer, _Bool if_sid) { - Node *p_node = initNode(if_sid); +CNode *nodeWithPointer(const void *m_pointer, _Bool if_sid) { + CNode *p_node = initNode(if_sid); initMallocValueForNode(p_node, POINTER, m_pointer); return p_node; } diff --git a/src/event/event_callback.c b/src/event/event_callback.c index 24ba9ad..4a554a8 100644 --- a/src/event/event_callback.c +++ b/src/event/event_callback.c @@ -60,6 +60,7 @@ uint64_t getInfoForListThrough(Chain *expand_resources, int type){ return *((uint64_t *)p_node->value); } + /** 回调宏相关函数,构造回调函数的返回参数列表