add .gitignore, further improve vec

This commit is contained in:
cathugger 2017-10-09 20:17:01 +00:00
parent d8c8fba4d2
commit 90f42c1675
2 changed files with 15 additions and 11 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.o
*.onion

24
vec.h
View file

@ -7,9 +7,11 @@ VEC_STRUCT(vec_basestruct,void) ;
#define VEC_INIT(ctl) memset(&ctl,0,sizeof(ctl)) #define VEC_INIT(ctl) memset(&ctl,0,sizeof(ctl))
#define VEC_ELSIZE(ctl) (sizeof(*(ctl).buf))
void vec_add1(struct vec_basestruct *ctl,size_t sz); void vec_add1(struct vec_basestruct *ctl,size_t sz);
#define VEC_ADD1(ctl) \ #define VEC_ADD1(ctl) \
vec_add1((struct vec_basestruct *)&(ctl),sizeof(*(ctl).buf)) vec_add1((struct vec_basestruct *)&(ctl),VEC_ELSIZE(ctl))
#define VEC_ADD(ctl,val) { \ #define VEC_ADD(ctl,val) { \
VEC_ADD1(ctl); \ VEC_ADD1(ctl); \
(ctl).buf[(ctl).len - 1] = (val); \ (ctl).buf[(ctl).len - 1] = (val); \
@ -17,24 +19,24 @@ void vec_add1(struct vec_basestruct *ctl,size_t sz);
void vec_addn(struct vec_basestruct *ctl,size_t sz,size_t n); void vec_addn(struct vec_basestruct *ctl,size_t sz,size_t n);
#define VEC_ADDN(ctl,n) \ #define VEC_ADDN(ctl,n) \
vec_addn((struct vec_basestruct *)&(ctl),sizeof(*(ctl).buf),(n)) vec_addn((struct vec_basestruct *)&(ctl),VEC_ELSIZE(ctl),(n))
#define VEC_REMOVE(ctl,n) { \ #define VEC_REMOVEN(ctl,n,m) { \
--(ctl).len; \ (ctl).len -= m; \
memmove( \ memmove( \
&(ctl).buf[(n)], \ &(ctl).buf[(n)], \
&(ctl).buf[(n + 1)], \ &(ctl).buf[(n + m)], \
((ctl).len - (n)) * sizeof(*(ctl).buf)); \ ((ctl).len - (n)) * VEC_ELSIZE(ctl)); \
} }
#define VEC_REMOVE(ctl,n) VEC_REMOVEN(ctl,n,1)
#define VEC_INSERT1(ctl,n) { \ #define VEC_INSERT1(ctl,n) { \
VEC_ADD1(ctl); \ VEC_ADD1(ctl); \
memmove( \ memmove( \
&(ctl).buf[(n + 1)], \ &(ctl).buf[(n + 1)], \
&(ctl).buf[(n)], \ &(ctl).buf[(n)], \
((ctl).len - (n) - 1) * sizeof(*(ctl).buf)); \ ((ctl).len - (n) - 1) * VEC_ELSIZE(ctl)); \
} }
#define VEC_INSERT(ctl,n,val) { \ #define VEC_INSERT(ctl,n,val) { \
VEC_INSERT1(ctl,n); \ VEC_INSERT1(ctl,n); \
(ctl).buf[n] = (val); \ (ctl).buf[n] = (val); \
@ -45,17 +47,17 @@ void vec_addn(struct vec_basestruct *ctl,size_t sz,size_t n);
memmove( \ memmove( \
&(ctl).buf[(n + m)], \ &(ctl).buf[(n + m)], \
&(ctl).buf[(n)], \ &(ctl).buf[(n)], \
((ctl).len - (n) - (m)) * sizeof(*(ctl).buf)); \ ((ctl).len - (n) - (m)) * VEC_ELSIZE(ctl)); \
} }
#define VEC_ZERO(ctl) { \ #define VEC_ZERO(ctl) { \
if ((ctl).buf) \ if ((ctl).buf) \
memset((ctl).buf,0,(ctl).len * sizeof(*(ctl).buf)); \ memset((ctl).buf,0,(ctl).len * VEC_ELSIZE(ctl)); \
} }
#define VEC_FREE(ctl) { \ #define VEC_FREE(ctl) { \
free((ctl).buf); \ free((ctl).buf); \
memset(&(ctl), 0, sizeof((ctl))); \ memset(&(ctl), 0, sizeof(ctl)); \
} }
#define VEC_LENGTH(ctl) ((ctl).len) #define VEC_LENGTH(ctl) ((ctl).len)