X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_avltree.c;h=6a25fb57657104470a1f18fdf7d008f94e830fd6;hb=dd324a1592259913e6e92d3b54e6fa2b0c5f38f7;hp=3e258e95d8c6834271823cab5aa5cddfc3a4845a;hpb=cc5ee53dfba55d6fe7c26513618a582adf80b7fa;p=collectd.git

diff --git a/src/utils_avltree.c b/src/utils_avltree.c
index 3e258e95..6a25fb57 100644
--- 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
@@ -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);
 	}
 
@@ -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 */
 
@@ -606,10 +613,18 @@ int c_avl_pick (c_avl_tree_t *t, void **key, void **value)
 	n = t->root;
 	while ((n->left != NULL) || (n->right != NULL))
 	{
-		int height_left  = (n->left  == NULL) ? 0 : n->left->height;
-		int height_right = (n->right == NULL) ? 0 : n->right->height;
+		if (n->left == NULL)
+		{
+			n = n->right;
+			continue;
+		}
+		else if (n->right == NULL)
+		{
+			n = n->left;
+			continue;
+		}
 
-		if (height_left > height_right)
+		if (n->left->height > n->right->height)
 			n = n->left;
 		else
 			n = n->right;
@@ -710,3 +725,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);
+}