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);
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 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)))