projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am: s/INCLUDES/AM_CPPFLAGS/
[collectd.git]
/
src
/
utils_avltree.c
diff --git
a/src/utils_avltree.c
b/src/utils_avltree.c
index
12310d3
..
f71b1fd
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 *);
{
c_avl_node_t *root;
int (*compare) (const void *, const void *);
+ int size;
};
struct c_avl_iterator_s
};
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->root = NULL;
t->compare = compare;
+ t->size = 0;
return (t);
}
return (t);
}
@@
-510,6
+512,7
@@
int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
{
new->parent = NULL;
t->root = new;
{
new->parent = NULL;
t->root = new;
+ t->size = 1;
return (0);
}
return (0);
}
@@
-555,6
+558,7
@@
int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
} /* while (42) */
verify_tree (t->root);
} /* while (42) */
verify_tree (t->root);
+ ++t->size;
return (0);
} /* int c_avl_insert */
return (0);
} /* int c_avl_insert */
@@
-576,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);
status = _remove (t, n);
verify_tree (t->root);
+ --t->size;
return (status);
} /* void *c_avl_remove */
return (status);
} /* void *c_avl_remove */
@@
-712,3
+717,10
@@
void c_avl_iterator_destroy (c_avl_iterator_t *iter)
{
free (iter);
}
{
free (iter);
}
+
+int c_avl_size (c_avl_tree_t *t)
+{
+ if (t == NULL)
+ return (0);
+ return (t->size);
+}