diff options
| author | cathook <cat.hook31894@gmail.com> | 2013-12-16 23:52:16 +0800 |
|---|---|---|
| committer | cathook <cat.hook31894@gmail.com> | 2013-12-16 23:52:16 +0800 |
| commit | 447f9799d9540db49e533efd61fd9d112c1255d0 (patch) | |
| tree | 636e7299b28636b458b57e409812ed546e7a09e6 | |
| parent | 83f9010b097f7046d9e23a41d97563e2f299deb6 (diff) | |
| download | ctl-447f9799d9540db49e533efd61fd9d112c1255d0.tar.gz ctl-447f9799d9540db49e533efd61fd9d112c1255d0.tar.zst ctl-447f9799d9540db49e533efd61fd9d112c1255d0.zip | |
change the return type of getEntry()
| -rw-r--r-- | inc/array.h | 26 | ||||
| -rw-r--r-- | src/array.c | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/inc/array.h b/inc/array.h index 05a6492..e65e6cc 100644 --- a/inc/array.h +++ b/inc/array.h @@ -71,25 +71,25 @@ /* */ /**********************************************************/ -pvoid ctl_array_initX(ppvoid v, size_t size, uint count); -pvoid ctl_array_freeX(ppvoid v); +pvoid ctl_array_initX(ppvoid v, size_t size, uint count); +pvoid ctl_array_freeX(ppvoid v); -int ctl_array_getSizeX (ppvoid v); -pcvoid ctl_array_getEntryX (ppvoid v, uint index); -int ctl_array_getEntrySizeX(ppvoid v); +int ctl_array_getSizeX (ppvoid v); +pvoid ctl_array_getEntryX (ppvoid v, uint index); +int ctl_array_getEntrySizeX(ppvoid v); -int ctl_array_setSizeX (ppvoid v, uint count); -pvoid ctl_array_setEntryX(ppvoid v, uint index, pcvoid data); +int ctl_array_setSizeX (ppvoid v, uint count); +pvoid ctl_array_setEntryX(ppvoid v, uint index, pcvoid data); -int ctl_array_addBackX (ppvoid v, pcvoid entry); -int ctl_array_delBackX (ppvoid v); +int ctl_array_addBackX (ppvoid v, pcvoid entry); +int ctl_array_delBackX (ppvoid v); //int ctl_array_addFrontX(ppvoid v, pcvoid entry); //int ctl_array_delFrontX(ppvoid v); -int ctl_array_catX (ppvoid v, ppcvoid v2); -pvoid ctl_array_copyX (ppvoid v, ppcvoid v2); -int ctl_array_replaceX(ppvoid v , uint i1, uint ct1, - ppcvoid v2, uint j1, int ct2); +int ctl_array_catX (ppvoid v, ppcvoid v2); +pvoid ctl_array_copyX (ppvoid v, ppcvoid v2); +int ctl_array_replaceX(ppvoid v , uint i1, uint ct1, + ppcvoid v2, uint j1, int ct2); #define ctl_array_init(X,Y,Z) ctl_array_initX(ppVoid(X),Y,Z) #define ctl_array_free(X) ctl_array_freeX(ppVoid(X)) diff --git a/src/array.c b/src/array.c index 2920320..d2417e1 100644 --- a/src/array.c +++ b/src/array.c @@ -13,7 +13,7 @@ typedef struct{ char buf[]; } VectorHeader; -#define getHeader(X) ((VectorHeader*)(pChar(X)-sizeof(VectorHeader))) +#define getHeader(X) ((VectorHeader*)(pChar(X)-offsetof(VectorHeader,buf))) #define getTotal2(X,Y) ((Y)*(X)+sizeof(VectorHeader)) #define getTotal(X) getTotal2((X)->mem_count,(X)->size) @@ -36,7 +36,7 @@ pvoid ctl_array_initX(ppvoid v, size_t size, uint count){ return pVoid(tmp->buf); } -/******************** destructure *************************/ +/*********************** destructure **********************/ pvoid ctl_array_freeX(ppvoid v){ free(pVoid(getHeader(*v))); *v = NULL; @@ -48,8 +48,8 @@ int ctl_array_getSizeX(ppvoid v){ return getHeader(*v)->use_count; } -pcvoid ctl_array_getEntryX(ppvoid v, uint index){ - return pcVoid(pChar(*v) + getHeader(*v)->size * index); +pvoid ctl_array_getEntryX(ppvoid v, uint index){ + return pVoid(pChar(*v) + getHeader(*v)->size * index); } int ctl_array_getEntrySizeX(ppvoid v){ |