X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=26bd05139499c94896570ac7810c2075deb1f696;hb=3bda5a775df240e8fee97922db4e3fe482d8ecc3;hp=64d8fda77ce9de5d470cbbaaee057c1cf8a8aeb2;hpb=8495925885c6adaebada05f11e6f6b1a8b687e2c;p=swftools.git diff --git a/lib/q.h b/lib/q.h index 64d8fda..26bd051 100644 --- a/lib/q.h +++ b/lib/q.h @@ -156,7 +156,7 @@ void stringarray_destroy(stringarray_t*sa); dict_t*dict_new(); dict_t*dict_new2(type_t*type); -void dict_init(dict_t*dict); +void dict_init(dict_t*dict, int size); dictentry_t*dict_put(dict_t*h, const void*key, void* data); int dict_count(dict_t*h); void dict_dump(dict_t*h, FILE*fi, const char*prefix); @@ -191,10 +191,12 @@ void array_free(array_t*array); void*array_getkey(array_t*array, int nr); void*array_getvalue(array_t*array, int nr); int array_append(array_t*array, const void*name, void*data); +#define array_contains(a,b) (array_find((a),(b))>=0) int array_find(array_t*array, const void*name); int array_find2(array_t*array, const void*name, void*data); int array_update(array_t*array, const void*name, void*data); int array_append_if_new(array_t*array, const void*name, void*data); +#define array_length(a) ((a)->num) #define DECLARE(x) struct _##x;typedef struct _##x x##_t; #define DECLARE_LIST(x) \ @@ -206,9 +208,11 @@ typedef struct _##x##_list x##_list_t; int list_length_(void*_list); void*list_clone_(void*_list); void list_append_(void*_list, void*entry); +void list_prepend_(void*_list, void*entry); void list_free_(void*_list); #define list_new() ((void*)0) #define list_append(list, e) {sizeof((list)->next);list_append_(&(list),(e));} +#define list_prepend(list, e) {sizeof((list)->next);list_prepend_(&(list),(e));} #define list_free(list) {sizeof((list)->next);list_free_(&(list));} #define list_clone(list) (sizeof((list)->next),list_clone_(&(list))) #define list_length(list) (sizeof((list)->next),list_length_(list))