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

diff --git a/lib/q.h b/lib/q.h
index 4674cf4..f6d597d 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -23,6 +23,7 @@
 #define __q_h__
 
 #include <stdio.h>
+#include "mem.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -134,6 +135,8 @@ typedef struct _trie {
 char* strdup_n(const char*str, int size);
 char* allocprintf(const char*str, ...);
 
+float medianf(float*values, int n);
+
 unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
 unsigned int crc32_add_string(unsigned int crc32, const char*s);
 
@@ -189,6 +192,7 @@ dictentry_t* dict_get_slot(dict_t*h, const void*key);
 char dict_contains(dict_t*h, const void*s);
 void* dict_lookup(dict_t*h, const void*s);
 char dict_del(dict_t*h, const void*s);
+char dict_del2(dict_t*h, const void*key, void*data);
 dict_t*dict_clone(dict_t*);
 
 void dict_foreach_keyvalue(dict_t*h, void (*runFunction)(void*data, const void*key, void*val), void*data);
@@ -197,9 +201,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 +221,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);