X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=b90b57a789c7ff0fd3790a0ba19917ef624e5550;hb=fc0b3bbd680ad6aee83ff13cb57f5016a442d0e2;hp=d1dcc57cc9fccd623358099296f31e8f9ef3dec1;hpb=95373c20bb54780d9b38d1cb3877c8a6303afa49;p=swftools.git diff --git a/lib/q.h b/lib/q.h index d1dcc57..b90b57a 100644 --- a/lib/q.h +++ b/lib/q.h @@ -171,14 +171,16 @@ void dict_put2(dict_t*h, const char*s, void*data); int dict_count(dict_t*h); void dict_dump(dict_t*h, FILE*fi, const char*prefix); dictentry_t* dict_get_slot(dict_t*h, const void*key); +char dict_contains(dict_t*h, const void*s); void* dict_lookup(dict_t*h, const void*s); char dict_del(dict_t*h, const void*s); dict_t*dict_clone(dict_t*); void dict_foreach_keyvalue(dict_t*h, void (*runFunction)(void*data, const void*key, void*val), void*data); void dict_foreach_value(dict_t*h, void (*runFunction)(void*)); -void dict_free_all(dict_t*h, void (*freeFunction)(void*)); +void dict_free_all(dict_t*h, char free_keys, void (*free_data_function)(void*)); void dict_clear(dict_t*h); +void dict_destroy_shallow(dict_t*dict); void dict_destroy(dict_t*dict); void map_init(map_t*map); @@ -222,8 +224,10 @@ void*list_clone_(void*_list); void list_append_(void*_list, void*entry); void list_prepend_(void*_list, void*entry); void list_free_(void*_list); +void list_concat_(void*l1, void*l2); #define list_new() ((void*)0) #define list_append(list, e) {sizeof((list)->next);list_append_(&(list),(e));} +#define list_concat(l1, l2) {sizeof((l1)->next);sizeof((l2)->next);list_concat_(&(l1),&(l2));} #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)))