X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_avltree.c;h=0436d8fe077eceeaffdeff607bc8f9e44ebe5aca;hb=3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262;hp=9f0b7968916863f1d42abfca8bc594afdeacea2a;hpb=a2d4be2febb99bf548b991be25f055d37285ddea;p=collectd.git diff --git a/src/utils_avltree.c b/src/utils_avltree.c index 9f0b7968..0436d8fe 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,6 +480,7 @@ c_avl_tree_t *c_avl_create (int (*compare) (const void *, const void *)) t->root = NULL; t->compare = compare; + t->size = 0; return (t); } @@ -553,6 +555,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 +577,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 +585,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); @@ -708,3 +714,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); +}