X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=cbb57759978e544b23d47694cc59dc202779dd71;hp=e872dc55fff872080035fe550c798f280ca9ac78;hb=fb0e4138070d7c2ce723af5780e763af3a1353d8;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/utils.h b/utils.h
index e872dc5..cbb5775 100644
--- a/utils.h
+++ b/utils.h
@@ -4,16 +4,6 @@
 #include <libubox/list.h>
 #include <libubox/avl.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
-#else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
-#endif
-
-static inline void no_debug(const char *fmt, ...)
-{
-}
-
 #define __init __attribute__((constructor))
 
 struct vlist_tree;
@@ -27,9 +17,9 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-
-	int data_offset;
-	int data_len;
+	int key_offset;
+	bool keep_old;
+	bool no_delete;
 
 	int version;
 };
@@ -39,17 +29,27 @@ struct vlist_node {
 	int version;
 };
 
-void __vlist_init(struct vlist_tree *tree, vlist_update_cb update, int offset, int len);
+void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
 
-#define vlist_init(tree, update, type, vlist, first, last) \
-	__vlist_init(tree, update, offsetof(type, first) - offsetof(type, vlist), \
-		     offsetof(type, last) - offsetof(type, first) + sizeof(((type *) 0)->last))
+#define vlist_init(tree, cmp, update, type, node, key) \
+	__vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+
+#define vlist_find(tree, name, element, node_member) \
+	avl_find_element(&(tree)->avl, name, element, node_member.avl)
+
+static inline void vlist_update(struct vlist_tree *tree)
+{
+	tree->version++;
+}
 
 void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
 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);
 
+#define vlist_for_each_element(tree, element, node_member) \
+	avl_for_each_element(&(tree)->avl, element, node_member.avl)
+
 #ifdef __linux__
 static inline int fls(int x)
 {