Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / utils_avltree.c

diff --git a/src/utils_avltree.c b/src/utils_avltree.c
index 83821fe99c37671ad36ece3ab3d14ddcba84f1d1..f71b1fd6913bbc9676bb0e494d26bba1f829e7c2 100644 (file)
--- a/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@ -51,6 +51,7 @@ struct c_avl_tree_s
 {
        c_avl_node_t *root;
        int (*compare) (const void *, const void *);
+       int size;
 };
 
 struct c_avl_iterator_s
@@ -264,7 +265,7 @@ static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
        } /* while (n != NULL) */
 } /* void rebalance */
 
-static c_avl_node_t *c_avl_node_next (c_avl_tree_t *t, c_avl_node_t *n)
+static c_avl_node_t *c_avl_node_next (c_avl_node_t *n)
 {
        c_avl_node_t *r; /* return node */
 
@@ -309,7 +310,7 @@ static c_avl_node_t *c_avl_node_next (c_avl_tree_t *t, c_avl_node_t *n)
        return (r);
 } /* c_avl_node_t *c_avl_node_next */
 
-static c_avl_node_t *c_avl_node_prev (c_avl_tree_t *t, c_avl_node_t *n)
+static c_avl_node_t *c_avl_node_prev (c_avl_node_t *n)
 {
        c_avl_node_t *r; /* return node */
 
@@ -364,13 +365,13 @@ static int _remove (c_avl_tree_t *t, c_avl_node_t *n)
                if (BALANCE (n) > 0) /* left subtree is higher */
                {
                        assert (n->left != NULL);
-                       r = c_avl_node_prev (t, n);
+                       r = c_avl_node_prev (n);
                        
                }
                else /* right subtree is higher */
                {
                        assert (n->right != NULL);
-                       r = c_avl_node_next (t, n);
+                       r = c_avl_node_next (n);
                }
 
                assert ((r->left == NULL) || (r->right == NULL));
@@ -479,12 +480,15 @@ c_avl_tree_t *c_avl_create (int (*compare) (const void *, const void *))
 
        t->root = NULL;
        t->compare = compare;
+       t->size = 0;
 
        return (t);
 }
 
 void c_avl_destroy (c_avl_tree_t *t)
 {
+       if (t == NULL)
+               return;
        free_node (t->root);
        free (t);
 }
@@ -508,6 +512,7 @@ int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
        {
                new->parent = NULL;
                t->root = new;
+               t->size = 1;
                return (0);
        }
 
@@ -518,7 +523,7 @@ int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
                if (cmp == 0)
                {
                        free_node (new);
-                       return (-1);
+                       return (1);
                }
                else if (cmp < 0)
                {
@@ -553,6 +558,7 @@ int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
        } /* while (42) */
 
        verify_tree (t->root);
+       ++t->size;
        return (0);
 } /* int c_avl_insert */
 
@@ -574,6 +580,7 @@ int c_avl_remove (c_avl_tree_t *t, const void *key, void **rkey, void **rvalue)
 
        status = _remove (t, n);
        verify_tree (t->root);
+       --t->size;
        return (status);
 } /* void *c_avl_remove */
 
@@ -581,6 +588,8 @@ int c_avl_get (c_avl_tree_t *t, const void *key, void **value)
 {
        c_avl_node_t *n;
 
+       assert (t != NULL);
+
        n = search (t, key);
        if (n == NULL)
                return (-1);
@@ -662,7 +671,7 @@ int c_avl_iterator_next (c_avl_iterator_t *iter, void **key, void **value)
        }
        else
        {
-               n = c_avl_node_next (iter->tree, iter->node);
+               n = c_avl_node_next (iter->node);
        }
 
        if (n == NULL)
@@ -691,7 +700,7 @@ int c_avl_iterator_prev (c_avl_iterator_t *iter, void **key, void **value)
        }
        else
        {
-               n = c_avl_node_prev (iter->tree, iter->node);
+               n = c_avl_node_prev (iter->node);
        }
 
        if (n == NULL)
@@ -708,3 +717,10 @@ void c_avl_iterator_destroy (c_avl_iterator_t *iter)
 {
        free (iter);
 }
+
+int c_avl_size (c_avl_tree_t *t)
+{
+       if (t == NULL)
+               return (0);
+       return (t->size);
+}