X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=kvlist.h;h=eaa691c229443843c1be417013a1ddfb2ccf90b0;hp=339cc1db8a1ced0f854f0e95689847479784ecbc;hb=4bc3decf8743c0add93d434a639bb1b449b6da11;hpb=d4b56b09403e6bf802633c447a3877eefb6ff41c

diff --git a/kvlist.h b/kvlist.h
index 339cc1d..eaa691c 100644
--- a/kvlist.h
+++ b/kvlist.h
@@ -18,12 +18,13 @@
 #ifndef __LIBUBOX_KVLIST_H
 #define __LIBUBOX_KVLIST_H
 
+#include "avl-cmp.h"
 #include "avl.h"
 
 struct kvlist {
 	struct avl_tree avl;
 
-	int (*get_len)(struct kvlist *kv, void *data);
+	int (*get_len)(struct kvlist *kv, const void *data);
 };
 
 struct kvlist_node {
@@ -32,23 +33,32 @@ struct kvlist_node {
 	char data[0] __attribute__((aligned(4)));
 };
 
+#define KVLIST_INIT(_name, _get_len)						\
+	{									\
+		.avl = AVL_TREE_INIT(_name.avl, avl_strcmp, false, NULL),	\
+		.get_len = _get_len						\
+	}
+
+#define KVLIST(_name, _get_len)							\
+	struct kvlist _name = KVLIST_INIT(_name, _get_len)
+
 #define __ptr_to_kv(_ptr) container_of(((char *) (_ptr)), struct kvlist_node, data[0])
 #define __avl_list_to_kv(_l) container_of(_l, struct kvlist_node, avl.list)
 
 #define kvlist_for_each(kv, name, value) \
 	for (value = (void *) __avl_list_to_kv((kv)->avl.list_head.next)->data,			\
-	     name = (const char *) __ptr_to_kv(value)->avl.key;					\
+	     name = (const char *) __ptr_to_kv(value)->avl.key, (void) name;			\
 	     &__ptr_to_kv(value)->avl.list != &(kv)->avl.list_head;				\
 	     value = (void *) (__avl_list_to_kv(__ptr_to_kv(value)->avl.list.next))->data,	\
 	     name = (const char *) __ptr_to_kv(value)->avl.key)
 
-void kvlist_init(struct kvlist *kv, int (*get_len)(struct kvlist *kv, void *data));
+void kvlist_init(struct kvlist *kv, int (*get_len)(struct kvlist *kv, const void *data));
 void kvlist_free(struct kvlist *kv);
 void *kvlist_get(struct kvlist *kv, const char *name);
-void kvlist_set(struct kvlist *kv, const char *name, void *data);
+bool kvlist_set(struct kvlist *kv, const char *name, const void *data);
 bool kvlist_delete(struct kvlist *kv, const char *name);
 
-int kvlist_strlen(struct kvlist *kv, void *data);
-int kvlist_blob_len(struct kvlist *kv, void *data);
+int kvlist_strlen(struct kvlist *kv, const void *data);
+int kvlist_blob_len(struct kvlist *kv, const void *data);
 
 #endif