} trie_t;
char* strdup_n(const char*str, int size);
+char* allocprintf(const char*str, ...);
unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
unsigned int crc32_add_string(unsigned int crc32, const char*s);
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);
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);