add .gitignore

[project/netifd.git] / utils.c

diff --git a/utils.c b/utils.c
index 42d3176..5219546 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -11,7 +11,7 @@ void
 __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
             vlist_update_cb update, int offset)
 {
-       tree->node_offset = offset;
+       tree->key_offset = offset;
        tree->update = update;
        tree->version = 1;
 
@@ -21,7 +21,8 @@ __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
 void
 vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
 {
-       avl_delete(&tree->avl, &node->avl);
+       if (!tree->no_delete)
+               avl_delete(&tree->avl, &node->avl);
        tree->update(tree, NULL, node);
 }
 
@@ -30,7 +31,7 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node)
 {
        struct vlist_node *old_node = NULL;
        struct avl_node *anode;
-       void *key = (char *) node - tree->node_offset;
+       void *key = (char *) node + tree->key_offset;
 
        node->avl.key = key;
        node->version = tree->version;
@@ -38,10 +39,15 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node)
        anode = avl_find(&tree->avl, key);
        if (anode) {
                old_node = container_of(anode, struct vlist_node, avl);
+               if (tree->keep_old || !tree->no_delete)
+                       goto update_only;
+
                avl_delete(&tree->avl, anode);
        }
 
        avl_insert(&tree->avl, &node->avl);
+
+update_only:
        tree->update(tree, node, old_node);
 }