vlist: store a pointer to the real key to make lookups easier

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index e872dc5..31fcd1f 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -27,9 +27,8 @@ struct vlist_tree {
        struct avl_tree avl;
 
        vlist_update_cb update;
-
-       int data_offset;
-       int data_len;
+       int key_offset;
+       bool keep_old;
 
        int version;
 };
@@ -39,11 +38,10 @@ 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))
 
 void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
 void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);