X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.c;h=0d0d944529a40e7681b9ab895d99c39b26be1e23;hb=35bef20c4bea1a43ea4072f0ea7ff5bbc68412ee;hp=989c47f4993984c37d5b784886ff34b58139a7fd;hpb=f0a3da08874dcfae2f3180559b208f6726702e6a;p=swftools.git

diff --git a/lib/q.c b/lib/q.c
index 989c47f..0d0d944 100644
--- a/lib/q.c
+++ b/lib/q.c
@@ -600,25 +600,44 @@ 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;
 }
 
+dict_t*dict_clone(dict_t*o)
+{
+    dict_t*h = rfx_alloc(sizeof(dict_t));
+    memcpy(h, o, sizeof(dict_t));
+    h->slots = h->hashsize?(dictentry_t**)rfx_calloc(sizeof(dictentry_t*)*h->hashsize):0;
+    int t;
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            dictentry_t*n = (dictentry_t*)rfx_alloc(sizeof(dictentry_t));
+            memcpy(n, e, sizeof(dictentry_t));
+            n->data = h->key_type->dup(e->data);
+            n->next = h->slots[t];
+            h->slots[t] = n;
+        }
+    }
+    return h;
+}
+
 static void dict_expand(dict_t*h, int newlen)
 {
     assert(h->hashsize < newlen);
@@ -746,7 +765,7 @@ char dict_del(dict_t*h, const void*key)
     return 0;
 }
 
-static dictentry_t* dict_get_slot(dict_t*h, const void*key)
+dictentry_t* dict_get_slot(dict_t*h, const void*key)
 {
     if(!h->num)
         return 0;
@@ -799,6 +818,7 @@ void dict_free_all(dict_t*h, void (*freeFunction)(void*))
             rfx_free(e);
             e = next;
         }
+        h->slots[t]=0;
     }
     rfx_free(h->slots);
     memset(h, 0, sizeof(dict_t));
@@ -827,7 +847,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)
 {