X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fq.h;h=df1c07459ad10bc3eaeb36e6f3a57bf6752dbcd8;hp=4674cf496ab01e942ffe885f0c6d396320df4c4d;hb=66a03382aab040571f94b0861719753bda3ff8f1;hpb=d9028caacb25b27d07c6b642556e8d372bb267a1

diff --git a/lib/q.h b/lib/q.h
index 4674cf4..df1c074 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -197,9 +197,18 @@ 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)
+#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);
@@ -208,11 +217,14 @@ void map_dump(map_t*map, FILE*fi, const char*prefix);
 void map_clear(map_t*map);
 void map_destroy(map_t*map);
 
-void heap_init(heap_t*h,int n,int elem_size, int(*compare)(const void *, const void *));
+void heap_init(heap_t*h,int elem_size, int(*compare)(const void *, const void *));
+heap_t* heap_new(int elem_size, int(*compare)(const void *, const void *));
+heap_t* heap_clone(heap_t*o);
 void heap_clear(heap_t*h);
+void heap_destroy(heap_t*h);
 void heap_put(heap_t*h, void*e);
 int heap_size(heap_t*h);
-void* heap_max(heap_t*h);
+void* heap_peek(heap_t*h);
 void* heap_chopmax(heap_t*h);
 void heap_dump(heap_t*h, FILE*fi);
 void** heap_flatten(heap_t*h);