X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=5ea9c6f092915138fbff666e4e09c17ea789a56a;hp=b5ae7e00002d137e29b76792a0d50a9b59b20476;hb=e64619267d7b4e5f5fec57718c0e11e7844dc9ee;hpb=b7e1b35ff18a759a54e4033d04a3550499dd9fc1

diff --git a/utils.h b/utils.h
index b5ae7e0..5ea9c6f 100644
--- a/utils.h
+++ b/utils.h
@@ -3,6 +3,26 @@
 
 #include <libubox/list.h>
 #include <libubox/avl.h>
+#include <libubox/blobmsg.h>
+
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#else
+extern int __build_bug_on_failed;
+#define BUILD_BUG_ON(condition)				 \
+	do {							\
+		((void)sizeof(char[1 - 2*!!(condition)]));  \
+		if (condition) __build_bug_on_failed = 1;   \
+	} while(0)
+#endif
+
+static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
+{
+	if (!attr)
+		return val;
+
+	return blobmsg_get_bool(attr);
+}
 
 #define __init __attribute__((constructor))
 
@@ -17,7 +37,6 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-	int key_offset;
 	bool keep_old;
 	bool no_delete;
 
@@ -29,10 +48,7 @@ struct vlist_node {
 	int version;
 };
 
-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, key) \
-	__vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
 
 #define vlist_find(tree, name, element, node_member) \
 	avl_find_element(&(tree)->avl, name, element, node_member.avl)
@@ -42,7 +58,7 @@ static inline void vlist_update(struct vlist_tree *tree)
 	tree->version++;
 }
 
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
+void vlist_add(struct vlist_tree *tree, struct vlist_node *node, 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);
@@ -77,6 +93,7 @@ static inline void vlist_simple_update(struct vlist_simple_tree *tree)
 
 static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
 {
+	node->version = tree->version;
 	list_add(&node->list, &tree->list);
 }