X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=6500fdf80297b50841c06fc9e28c3e63c2c7e3dc;hp=c8101e7323a88bc790f806a2f058d414ed1886f2;hb=2f47fa5db2ce0fbe118ed9b6727c3956a48c85fb;hpb=05e910cec691f8333383a746876015e99ff088db

diff --git a/utils.h b/utils.h
index c8101e7..6500fdf 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,7 +17,9 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-	int node_offset;
+	int key_offset;
+	bool keep_old;
+	bool no_delete;
 
 	int version;
 };
@@ -39,14 +31,22 @@ struct vlist_node {
 
 void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
 
-#define vlist_init(tree, cmp, update, type, node) \
-	__vlist_init(tree, cmp, update, offsetof(type, node))
+#define vlist_init(tree, cmp, update, type, node, key) \
+	__vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+
+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)
 {