X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.c;h=5a9cf7d8b20dbba427d5d287c88985471cc7451e;hb=3bda5a775df240e8fee97922db4e3fe482d8ecc3;hp=543d5795760ff9f76702105485d74bf420863881;hpb=8495925885c6adaebada05f11e6f6b1a8b687e2c;p=swftools.git diff --git a/lib/q.c b/lib/q.c index 543d579..5a9cf7d 100644 --- a/lib/q.c +++ b/lib/q.c @@ -600,20 +600,20 @@ static int max(int x, int y) { dict_t*dict_new() { dict_t*d = rfx_alloc(sizeof(dict_t)); - dict_init(d); + dict_init(d, INITIAL_SIZE); return d; } dict_t*dict_new2(type_t*t) { dict_t*d = rfx_alloc(sizeof(dict_t)); - dict_init(d); + dict_init(d, INITIAL_SIZE); d->key_type = t; return d; } -void dict_init(dict_t*h) +void dict_init(dict_t*h, int size) { memset(h, 0, sizeof(dict_t)); - h->hashsize = INITIAL_SIZE; + h->hashsize = size; h->slots = h->hashsize?(dictentry_t**)rfx_calloc(sizeof(dictentry_t*)*h->hashsize):0; h->num = 0; h->key_type = &charptr_type; @@ -827,7 +827,7 @@ void map_init(map_t*map) map_internal_t*m; map->internal = (map_internal_t*)rfx_calloc(sizeof(map_internal_t)); m = (map_internal_t*)map->internal; - dict_init(&m->d); + dict_init(&m->d, INITIAL_SIZE); } void map_put(map_t*map, string_t t1, string_t t2) { @@ -987,7 +987,7 @@ void list_append_(void*_list, void*entry) commonlist_t**list = (commonlist_t**)_list; commonlist_t* n = 0; if(!*list) { - n = malloc(sizeof(commonlist_t)+sizeof(listinfo_t)); + n = (commonlist_t*)malloc(sizeof(commonlist_t)+sizeof(listinfo_t)); *list = n; (*list)->info[0].size = 0; } else { @@ -999,6 +999,23 @@ void list_append_(void*_list, void*entry) (*list)->info[0].last = n; (*list)->info[0].size++; } +/* notice: prepending uses slighly more space than appending */ +void list_prepend_(void*_list, void*entry) +{ + commonlist_t**list = (commonlist_t**)_list; + commonlist_t* n = (commonlist_t*)malloc(sizeof(commonlist_t)+sizeof(listinfo_t)); + int size = 0; + commonlist_t* last = 0; + if(*list) { + last = (*list)->info[0].last; + size = (*list)->info[0].size; + } + n->next = *list; + n->entry = entry; + *list = n; + (*list)->info[0].last = last; + (*list)->info[0].size = size+1; +} void list_free_(void*_list) { commonlist_t**list = (commonlist_t**)_list;