avl_strcmp is now part of libubox

[project/netifd.git] / utils.c

diff --git a/utils.c b/utils.c
index 629cdb2..0894c65 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1,13 +1,20 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include "utils.h"
 
-int
-avl_strcmp(const void *k1, const void *k2, void *ptr)
-{
-       return strcmp(k1, k2);
-}
-
 void
 vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update)
 {
@@ -57,7 +64,8 @@ vlist_flush(struct vlist_tree *tree)
        struct vlist_node *node, *tmp;
 
        avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
-               if (node->version == tree->version)
+               if ((node->version == tree->version || node->version == -1) &&
+                   tree->version != -1)
                        continue;
 
                vlist_delete(tree, node);
@@ -67,7 +75,7 @@ vlist_flush(struct vlist_tree *tree)
 void
 vlist_flush_all(struct vlist_tree *tree)
 {
-       tree->version++;
+       tree->version = -1;
        vlist_flush(tree);
 }
 
@@ -96,7 +104,8 @@ vlist_simple_flush(struct vlist_simple_tree *tree)
        struct vlist_simple_node *n, *tmp;
 
        list_for_each_entry_safe(n, tmp, &tree->list, list) {
-               if (n->version == tree->version)
+               if ((n->version == tree->version || n->version == -1) &&
+                   tree->version != -1)
                        continue;
 
                vlist_simple_delete(tree, n);
@@ -104,8 +113,21 @@ vlist_simple_flush(struct vlist_simple_tree *tree)
 }
 
 void
+vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *old)
+{
+       struct vlist_simple_node *n, *tmp;
+
+       vlist_simple_update(dest);
+       list_for_each_entry_safe(n, tmp, &old->list, list) {
+               list_del(&n->list);
+               vlist_simple_add(dest, n);
+       }
+       vlist_simple_flush(dest);
+}
+
+void
 vlist_simple_flush_all(struct vlist_simple_tree *tree)
 {
-       tree->version++;
+       tree->version = -1;
        vlist_simple_flush(tree);
 }