diff options
author | cathook <cat.hook31894@gmail.com> | 2013-12-17 00:13:45 +0800 |
---|---|---|
committer | cathook <cat.hook31894@gmail.com> | 2013-12-17 00:13:45 +0800 |
commit | a81c826ade530377cf6d932cb8ca40df43faf133 (patch) | |
tree | 0168d428f4eb25c6925393ec56cdbcd4da1913f6 | |
parent | 1896959501e07c878ca423bc6bf8dc00582190a1 (diff) | |
download | ctl-a81c826ade530377cf6d932cb8ca40df43faf133.tar.gz ctl-a81c826ade530377cf6d932cb8ca40df43faf133.tar.zst ctl-a81c826ade530377cf6d932cb8ca40df43faf133.zip |
re change return typefeature-stack
-rw-r--r-- | inc/stack.h | 4 | ||||
-rw-r--r-- | src/stack.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/inc/stack.h b/inc/stack.h index 8abebb1..245519e 100644 --- a/inc/stack.h +++ b/inc/stack.h @@ -8,9 +8,9 @@ pvoid ctl_stack_freeX(ppvoid s); uint ctl_stack_getEntrySizeX(ppcvoid q); int ctl_stack_isEmptyX (ppcvoid q); -pcvoid ctl_stack_getX (ppcvoid q); +pvoid ctl_stack_getX ( ppvoid q); -int ctl_stack_addX(ppvoid q, pcvoid data); +pvoid ctl_stack_addX(ppvoid q, pcvoid data); int ctl_stack_delX(ppvoid q); pvoid ctl_stack_copyX(ppcvoid q, ppvoid q2); diff --git a/src/stack.c b/src/stack.c index 6374d7e..8d5e00a 100644 --- a/src/stack.c +++ b/src/stack.c @@ -25,6 +25,7 @@ typedef struct StackHeadStruct StackHead; #define getHead(X) (((StackNode*)(pChar(X)-offsetof(StackNode, buf)))->head) #define getSize(X) (sizeof(StackNode) + (getHead(X)->size)) +/************** constructure / destructure ****************/ pvoid ctl_stack_initX(ppvoid q, uint size){ StackHead* head = (StackHead*)ctl_malloc(sizeof(StackHead)); head->size = size; @@ -53,14 +54,14 @@ uint ctl_stack_getEntrySizeX(ppcvoid q){ return getHead(*q)->size; } -pcvoid ctl_stack_getX(ppcvoid q){ +pvoid ctl_stack_getX(ppvoid q){ return *q; } int ctl_stack_isEmptyX(ppcvoid q){ return (getHead(*q)->top == NULL ? 1 : 0); } -int ctl_stack_addX(ppvoid q, pcvoid data){ +pvoid ctl_stack_addX(ppvoid q, pcvoid data){ StackHead* head = getHead(*q); StackNode* temp = (StackNode*)ctl_malloc(getSize(*q)); temp->head = head; @@ -68,7 +69,7 @@ int ctl_stack_addX(ppvoid q, pcvoid data){ memcpy(temp->buf, data, head->size); head->top = temp; *q = pVoid(head->top->buf); - return 1; + return *q; } int ctl_stack_delX(ppvoid q){ StackHead* head = getHead(*q); |