X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_avltree.c;h=12310d3fa771d528fabc5ac313f76d42ed71aef6;hb=b4c8f3f762d666742c774ab3b45815e5a416e5da;hp=6ad02272c0220ff6eaef4cf9b42cd18fd386d39e;hpb=b7d9bc30c8853f75a50482ae14a74de31871cf6e;p=collectd.git

diff --git a/src/utils_avltree.c b/src/utils_avltree.c
index 6ad02272..12310d3f 100644
--- a/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@ -264,7 +264,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 +309,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 +364,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));
@@ -485,6 +485,8 @@ c_avl_tree_t *c_avl_create (int (*compare) (const void *, const void *))
 
 void c_avl_destroy (c_avl_tree_t *t)
 {
+	if (t == NULL)
+		return;
 	free_node (t->root);
 	free (t);
 }
@@ -581,6 +583,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 +666,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 +695,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)