projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed Solaris compilation errors
[collectd.git]
/
src
/
utils_avltree.c
diff --git
a/src/utils_avltree.c
b/src/utils_avltree.c
index
83821fe
..
0436d8f
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
@@
-264,7
+265,7
@@
static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
} /* while (n != NULL) */
} /* void rebalance */
} /* 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 */
{
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 */
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 */
{
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);
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);
}
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));
}
assert ((r->left == NULL) || (r->right == NULL));
@@
-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);
}
@@
-518,7
+520,7
@@
int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
if (cmp == 0)
{
free_node (new);
if (cmp == 0)
{
free_node (new);
- return (
-
1);
+ return (1);
}
else if (cmp < 0)
{
}
else if (cmp < 0)
{
@@
-553,6
+555,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 */
@@
-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);
status = _remove (t, n);
verify_tree (t->root);
+ --t->size;
return (status);
} /* void *c_avl_remove */
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;
{
c_avl_node_t *n;
+ assert (t != NULL);
+
n = search (t, key);
if (n == NULL)
return (-1);
n = search (t, key);
if (n == NULL)
return (-1);
@@
-662,7
+668,7
@@
int c_avl_iterator_next (c_avl_iterator_t *iter, void **key, void **value)
}
else
{
}
else
{
- n = c_avl_node_next (iter->
tree, iter->
node);
+ n = c_avl_node_next (iter->node);
}
if (n == NULL)
}
if (n == NULL)
@@
-691,7
+697,7
@@
int c_avl_iterator_prev (c_avl_iterator_t *iter, void **key, void **value)
}
else
{
}
else
{
- n = c_avl_node_prev (iter->
tree, iter->
node);
+ n = c_avl_node_prev (iter->node);
}
if (n == NULL)
}
if (n == NULL)
@@
-708,3
+714,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);
+}