fixed hash deletion

[swftools.git] / lib / q.c

diff --git a/lib/q.c b/lib/q.c
index 9438033..942cfbb 100644 (file)
--- a/lib/q.c
+++ b/lib/q.c
@@ -278,6 +278,40 @@ void** heap_flatten(heap_t*h)
     return nodes;
 }
 
+// ------------------------------- trie --------------------------------------
+
+void trie_put(trie_t**t, unsigned const char*id)
+{
+    if(!*t) {
+        (*t) = rfx_calloc(sizeof(trie_t));
+        (*t)->rest = (unsigned char*)strdup(id);
+        return;
+    } 
+    if((*t)->rest && (*t)->rest[0]) {
+        // shift whatever's currently in here one node down
+        trie_put(&(*t)->row[(*t)->rest[0]], (*t)->rest+1);
+        (*t)->rest = 0;
+    }
+    if(id[0]) {
+        trie_put(&(*t)->row[id[0]], id+1);
+    } else {
+        (*t)->rest = "";
+    }
+}
+
+int trie_lookup(trie_t*t, unsigned const char*id)
+{
+    while(t) {
+        if(t->rest && !strcmp(t->rest, id))
+            return 1;
+        t = t->row[id[0]];
+        if(!*id) 
+            return 0;
+        id++;
+    }
+    return 0;
+}
+
 // ------------------------------- crc32 --------------------------------------
 static unsigned int*crc32 = 0;
 static void crc32_init(void)
@@ -730,6 +764,14 @@ void dict_init(dict_t*h, int size)
     h->num = 0;
     h->key_type = &charptr_type;
 }
+void dict_init2(dict_t*h, type_t*t, int size) 
+{
+    memset(h, 0, sizeof(dict_t));
+    h->hashsize = size;
+    h->slots = h->hashsize?(dictentry_t**)rfx_calloc(sizeof(dictentry_t*)*h->hashsize):0;
+    h->num = 0;
+    h->key_type = t;
+}
 
 dict_t*dict_clone(dict_t*o)
 {
@@ -891,7 +933,7 @@ char dict_del(dict_t*h, const void*key)
             memset(e, 0, sizeof(dictentry_t));
             rfx_free(e);
             if(e == head) {
-                h->slots[hash] = 0;
+                h->slots[hash] = next;
             } else {
                 assert(prev);
                 prev->next = next;
@@ -1060,7 +1102,6 @@ array_t* array_new2(type_t*type) {
 void*array_getkey(array_t*array, int nr) {
     if(nr > array->num || nr<0) {
        printf("error: reference to element %d in array[%d]\n", nr, array->num);
-        *(int*)0 = 0xdead;
        return 0;
     }
     return array->d[nr].name;
@@ -1068,7 +1109,6 @@ void*array_getkey(array_t*array, int nr) {
 void*array_getvalue(array_t*array, int nr) {
     if(nr > array->num || nr<0) {
        printf("error: reference to element %d in array[%d]\n", nr, array->num);
-        *(int*)0 = 0xdead;
        return 0;
     }
     return array->d[nr].data;