X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=206691876c67270432660bf00abcc4de20ea78a2;hb=dee4e64246987c508ba0b70148ea9cc62848c117;hp=b74bfb5cc160b7a13a72a3c9a315048c8ca4dc59;hpb=be6e50bfea8de4f01e6e30adfa3bcaf3f6243886;p=ashd.git diff --git a/lib/utils.h b/lib/utils.h index b74bfb5..2066918 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -16,6 +16,7 @@ #define bufinit(buf) memset(&(buf), 0, sizeof(buf)) #define buffree(buf) do { if((buf).b != NULL) {free((buf).b);} bufinit(buf); } while(0) #define sizebuf(buf, wanted) (_sizebuf((struct buffer *)&(buf), (wanted), sizeof(*((buf).b)))) +#define bufdel(buf, i) (memmove((buf).b + (i), (buf).b + (i) + 1, (--((buf).d) - (i)) * sizeof(*((buf).b)))) #define bufadd(buf, new) \ do { \ _sizebuf((struct buffer *)&(buf), (buf).d + 1, sizeof(*((buf).b))); \ @@ -60,6 +61,12 @@ struct charvbuf { size_t s, d; }; +struct btree { + struct btree *l, *r; + int h; + void *d; +}; + void _sizebuf(struct buffer *buf, size_t wanted, size_t el); char *decstr(char **p, size_t *len); char *vsprintf2(char *format, va_list al); @@ -74,5 +81,9 @@ void bprintf(struct charbuf *buf, char *format, ...); void replstr(char **p, char *n); char *base64encode(char *data, size_t datalen); char *base64decode(char *data, size_t *datalen); +int bbtreedel(struct btree **tree, void *item, int (*cmp)(void *, void *)); +void freebtree(struct btree **tree, void (*ffunc)(void *)); +int bbtreeput(struct btree **tree, void *item, int (*cmp)(void *, void *)); +void *btreeget(struct btree *tree, void *key, int (*cmp)(void *, void *)); #endif