aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcathook <cat.hook31894@gmail.com>2013-12-16 23:59:41 +0800
committercathook <cat.hook31894@gmail.com>2013-12-16 23:59:41 +0800
commit99d10ed0c28ccd47a6d4e2ffa5f36a226b71503c (patch)
tree1a7c8701d423a9f09ca6fb5dbef647606ce9da18
parent73ddf7ecce9c279e6242bb889f392d895a166a6d (diff)
downloadctl-feature-list.tar.gz
ctl-feature-list.tar.zst
ctl-feature-list.zip
change some return typefeature-list
-rw-r--r--Makefile2
-rw-r--r--inc/list.h26
-rw-r--r--src/list.c14
3 files changed, 21 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index c43a7ca..c494ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ OBJ_CC := gcc $(GCC_OPT) -c -o
SLIB_CC := ar $(AR_OPT)
######################## targets ###########################
-OBJECT = utility vector list queue stack #dequeue heap map hash
+OBJECT = utility array list queue stack #dequeue heap map hash
SOURCE := $(foreach n,$(OBJECT),$(SRC)/$(n).c)
HEADER := $(foreach n,$(OBJECT),$(INC)/$(n).h)
diff --git a/inc/list.h b/inc/list.h
index 8b802f5..17f7bad 100644
--- a/inc/list.h
+++ b/inc/list.h
@@ -130,12 +130,12 @@
pvoid ctl_list_initX(ppvoid l, size_t size, uint count);
pvoid ctl_list_freeX(ppvoid l);
-int ctl_list_getSizeX (ppcvoid l);
-int ctl_list_getEntrySizeX(ppcvoid l);
-pcvoid ctl_list_getFrontX (ppcvoid l);
-pcvoid ctl_list_getBackX (ppcvoid l);
-pvoid ctl_list_getBeginX (ppcvoid l);
-pcvoid ctl_list_getEndX (ppcvoid l);
+int ctl_list_getSizeX (ppcvoid l);
+int ctl_list_getEntrySizeX(ppcvoid l);
+pvoid ctl_list_getFrontX ( ppvoid l);
+pvoid ctl_list_getBackX ( ppvoid l);
+pvoid ctl_list_getBeginX ( ppvoid l);
+pvoid ctl_list_getEndX ( ppvoid l);
int ctl_list_setSizeX (ppvoid l, uint count);
pvoid ctl_list_setFrontX(ppvoid l, pcvoid data);
@@ -152,15 +152,15 @@ pvoid ctl_list_moveX(ppvoid li, pvoid i1, pvoid i2, ppvoid out);
int ctl_list_swapX(ppvoid li, pvoid i1, pvoid i2,
ppvoid lj, pvoid j1, pvoid j2);
-pcvoid ctl_list_iterGetEntryX(pcvoid i);
-pvoid ctl_list_iterGetNextX (pcvoid i);
-pvoid ctl_list_iterGetPrevX (pcvoid i);
+pvoid ctl_list_iterGetEntryX(pvoid i);
+pvoid ctl_list_iterGetNextX (pvoid i);
+pvoid ctl_list_iterGetPrevX (pvoid i);
-pvoid ctl_list_iterSetEntryX(pvoid i, pcvoid data);
+pvoid ctl_list_iterSetEntryX(pvoid i, pcvoid data);
-pvoid ctl_list_iterDelX (pvoid i);
-pvoid ctl_list_iterDelPrevX(pvoid i);
-pvoid ctl_list_iterDelNextX(pvoid i);
+pvoid ctl_list_iterDelX (pvoid i);
+pvoid ctl_list_iterDelPrevX(pvoid i);
+pvoid ctl_list_iterDelNextX(pvoid i);
#define ctl_list_init(X,Y,Z) ctl_list_initX(ppVoid(X),Y,Z)
#define ctl_list_free(X) ctl_list_freeX(ppVoid(X))
diff --git a/src/list.c b/src/list.c
index ce78f9c..d4970d7 100644
--- a/src/list.c
+++ b/src/list.c
@@ -100,16 +100,16 @@ int ctl_list_getSizeX(ppcvoid l){
int ctl_list_getEntrySizeX(ppcvoid l){
return getHeader(*l)->size;
}
-pcvoid ctl_list_getFrontX(ppcvoid l){
+pvoid ctl_list_getFrontX(ppvoid l){
return getHeader(*l)->data.next->buf;
}
-pcvoid ctl_list_getBackX(ppcvoid l){
+pvoid ctl_list_getBackX(ppvoid l){
return getHeader(*l)->data.prev->buf;
}
-pvoid ctl_list_getBeginX(ppcvoid l){
+pvoid ctl_list_getBeginX(ppvoid l){
return getHeader(*l)->data.next->buf;
}
-pcvoid ctl_list_getEndX(ppcvoid l){
+pvoid ctl_list_getEndX(ppvoid l){
return *l;
}
@@ -237,13 +237,13 @@ int ctl_list_swapX(ppvoid li, pvoid i1, pvoid i2,
}
/******************** about iterator **********************/
-pcvoid ctl_list_iterGetEntryX(pcvoid i){
+pvoid ctl_list_iterGetEntryX(pvoid i){
return i;
}
-pvoid ctl_list_iterGetNextX(pcvoid i){
+pvoid ctl_list_iterGetNextX(pvoid i){
return getNode(i)->next->buf;
}
-pvoid ctl_list_iterGetPrevX(pcvoid i){
+pvoid ctl_list_iterGetPrevX(pvoid i){
return getNode(i)->prev->buf;
}