X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=kvlist.h;h=eaa691c229443843c1be417013a1ddfb2ccf90b0;hp=0d35b46a5f695cf629a9296f399e6fcd97b5639b;hb=ace64897d47b9bc7af277d8a3f8a0ff67976cba8;hpb=31b3893a72493c849c67aa1cd8c7c4c457ca360c

diff --git a/kvlist.h b/kvlist.h
index 0d35b46..eaa691c 100644
--- a/kvlist.h
+++ b/kvlist.h
@@ -18,6 +18,7 @@
 #ifndef __LIBUBOX_KVLIST_H
 #define __LIBUBOX_KVLIST_H
 
+#include "avl-cmp.h"
 #include "avl.h"
 
 struct kvlist {
@@ -32,6 +33,15 @@ 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)
 
@@ -45,7 +55,7 @@ struct kvlist_node {
 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, const 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, const void *data);