X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=3cf8cbef2ed54534b13bac84fa593ec6dbd6b224;hb=514edfe0ed692a226002388f6de8100beb28f90f;hp=173b2d6270376784afe9a316b491f78737a5576f;hpb=b1993c38d9f4ba57943c607b2151eca7d1c125b7;p=swftools.git

diff --git a/lib/q.h b/lib/q.h
index 173b2d6..3cf8cbe 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -35,6 +35,7 @@ typedef struct _mem_t {
     char*buffer;
     int len;
     int pos;
+    int read_pos;
 } mem_t;
 
 /* fifo buffered growing mem region */
@@ -119,6 +120,12 @@ typedef struct _heap
     int(*compare)(const void *, const void *);
 } heap_t;
 
+typedef struct _trie {
+    struct _trie*row[256];
+    unsigned char*rest;
+} trie_t;
+
+
 char* strdup_n(const char*str, int size);
 
 unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
@@ -127,6 +134,7 @@ unsigned int crc32_add_string(unsigned int crc32, const char*s);
 void mem_init(mem_t*mem);
 int mem_put(mem_t*m, void*data, int length);
 int mem_putstring(mem_t*m, string_t str);
+int mem_get(mem_t*m, void*data, int length);
 void mem_clear(mem_t*mem);
 void mem_destroy(mem_t*mem);
 
@@ -178,9 +186,13 @@ 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);
+#define DICT_ITERATE_DATA(d,t,v) int v##_i;dictentry_t*v##_e;t v;for(v##_i=0;v##_i<(d)->hashsize;v##_i++) for(v##_e=(d)->slots[v##_i]; v##_e && ((v=(t)v##_e->data)||1); v##_e=v##_e->next)
+#define DICT_ITERATE_KEY(d,t,v)  int v##_i;dictentry_t*v##_e;t v;for(v##_i=0;v##_i<(d)->hashsize;v##_i++) for(v##_e=(d)->slots[v##_i];v##_e && ((v=(t)v##_e->key)||1);v##_e=v##_e->next)
+#define DICT_ITERATE_ITEMS(d,t1,v1,t2,v2) int v1##_i;dictentry_t*v1##_e;t1 v1;t2 v2;for(v1##_i=0;v1##_i<(d)->hashsize;v1##_i++) for(v1##_e=(d)->slots[v1##_i]; v1##_e && (((v1=(t1)v1##_e->key)&&(v2=(t2)v1##_e->data))||1); v1##_e=v1##_e->next)
 
 void map_init(map_t*map);
 void map_put(map_t*map, string_t t1, string_t t2);
@@ -198,6 +210,9 @@ void* heap_chopmax(heap_t*h);
 void heap_dump(heap_t*h, FILE*fi);
 void** heap_flatten(heap_t*h);
 
+void trie_put(trie_t**t, unsigned const char*id);
+int trie_lookup(trie_t*t, unsigned const char*id);
+
 array_t* array_new();
 array_t* array_new2(type_t*type);
 void array_free(array_t*array);
@@ -223,10 +238,14 @@ 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_deep_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_deep_free(list) {sizeof((list)->next);list_deep_free_(&(list));}
 #define list_clone(list) (sizeof((list)->next),list_clone_(&(list)))
 #define list_length(list) (sizeof((list)->next),list_length_(list))