X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=vlist.h;h=8170abf7400985f17e50b254da6dceb89d223f8a;hp=19c1c2089ec78daf2ab43f62639ea77b634ec073;hb=6a75b3b6437d3c98d852c1bca131c8f81646f2f5;hpb=cddd9326dc9686a450005c8d53a36b06e3e60e8e

diff --git a/vlist.h b/vlist.h
index 19c1c20..8170abf 100644
--- a/vlist.h
+++ b/vlist.h
@@ -14,6 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef __LIBUBOX_VLIST_H
+#define __LIBUBOX_VLIST_H
+
 #include "avl.h"
 
 struct vlist_tree;
@@ -38,6 +41,19 @@ struct vlist_node {
 	int version;
 };
 
+#define VLIST_TREE_INIT(_name, _comp, _update, _keep_old, _no_delete)	\
+	{								\
+		.avl = AVL_TREE_INIT(_name.avl, _comp, false, NULL),	\
+		.update = _update,					\
+		.version = 1,						\
+		.keep_old = _keep_old,					\
+		.no_delete = _no_delete,				\
+	}
+
+#define VLIST_TREE(_name, ...)						\
+	struct vlist_tree _name =					\
+		VLIST_TREE_INIT(_name, __VA_ARGS__)
+
 void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
 
 #define vlist_find(tree, name, element, node_member) \
@@ -48,7 +64,7 @@ static inline void vlist_update(struct vlist_tree *tree)
 	tree->version++;
 }
 
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key);
+void vlist_add(struct vlist_tree *tree, struct vlist_node *node, const void *key);
 void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
 void vlist_flush(struct vlist_tree *tree);
 void vlist_flush_all(struct vlist_tree *tree);
@@ -56,3 +72,4 @@ void vlist_flush_all(struct vlist_tree *tree);
 #define vlist_for_each_element(tree, element, node_member) \
 	avl_for_each_element(&(tree)->avl, element, node_member.avl)
 
+#endif