X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=cc965b0391ac9c716acfadcdfec504213e142df2;hb=baf1f621c945198d5b54c5415a2a2b648adf51b6;hp=64d8fda77ce9de5d470cbbaaee057c1cf8a8aeb2;hpb=8495925885c6adaebada05f11e6f6b1a8b687e2c;p=swftools.git

diff --git a/lib/q.h b/lib/q.h
index 64d8fda..cc965b0 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 */
@@ -70,6 +71,7 @@ typedef struct _type_t {
 
 extern type_t charptr_type;
 extern type_t stringstruct_type;
+extern type_t ptr_type;
 
 typedef struct _dictentry {
     void*key;
@@ -126,6 +128,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);
 
@@ -134,15 +137,23 @@ void ringbuffer_put(ringbuffer_t*r, void*buf, int size);
 int ringbuffer_read(ringbuffer_t*r, void*buf, int size);
 void ringbuffer_clear(ringbuffer_t*r);
 
+/* old style functions- should be renamed */
 string_t string_new(const char*text, int len);
 string_t string_new2(const char*text);
+void string_dup(string_t*str, const char*text);
+void string_dup2(string_t*str, const char*text, int len);
+
+char* string_cstr(string_t*str);
+char* string_escape(string_t*str);
+string_t* string_new3(const char*text, int len);
+string_t* string_new4(const char*text);
+void string_free(string_t*s);
 unsigned int string_hash(const string_t*str);
 unsigned int string_hash2(const char*str);
 unsigned int string_hash3(const char*str, int len);
 void string_set(string_t*str, const char*text);
 void string_set2(string_t*str, const char*text, int len);
-void string_dup(string_t*str, const char*text);
-void string_dup2(string_t*str, const char*text, int len);
+string_t*string_dup3(string_t*s);
 int string_equals(string_t*str, const char*text);
 
 void stringarray_init(stringarray_t*sa, int hashsize);
@@ -156,17 +167,22 @@ void stringarray_destroy(stringarray_t*sa);
 
 dict_t*dict_new();
 dict_t*dict_new2(type_t*type);
-void dict_init(dict_t*dict);
+void dict_init(dict_t*dict, int size);
 dictentry_t*dict_put(dict_t*h, const void*key, void* data);
+void dict_put2(dict_t*h, const char*s, void*data);
 int dict_count(dict_t*h);
 void dict_dump(dict_t*h, FILE*fi, const char*prefix);
+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);
+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);
 
 void map_init(map_t*map);
@@ -191,10 +207,12 @@ void array_free(array_t*array);
 void*array_getkey(array_t*array, int nr);
 void*array_getvalue(array_t*array, int nr);
 int array_append(array_t*array, const void*name, void*data);
+#define array_contains(a,b) (array_find((a),(b))>=0)
 int array_find(array_t*array, const void*name);
 int array_find2(array_t*array, const void*name, void*data);
 int array_update(array_t*array, const void*name, void*data);
 int array_append_if_new(array_t*array, const void*name, void*data);
+#define array_length(a) ((a)->num)
 
 #define DECLARE(x) struct _##x;typedef struct _##x x##_t;
 #define DECLARE_LIST(x) \
@@ -206,9 +224,13 @@ typedef struct _##x##_list x##_list_t;
 int list_length_(void*_list);
 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_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_clone(list) (sizeof((list)->next),list_clone_(&(list)))
 #define list_length(list) (sizeof((list)->next),list_length_(list))