archive/archived
Archived
1
0
Fork 0
Code Activity

rbtree.c: return key instead of using callback.

Browse source
This commit is contained in:
Henrik Hautakoski 2011-02-01 10:21:57 +01:00
parent 9e185ea920
commit 442e912835
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rbtree.c
View file

@ -278,7 +278,7 @@ done:
return 1;
}
int rbtree_delete(rbtree *tree, const void *key) {
void* rbtree_delete(rbtree *tree, const void *key) {
rbnode head = {0};
@ -286,7 +286,7 @@ int rbtree_delete(rbtree *tree, const void *key) {
rbnode *q, *p, *g, *s;
/* found item */
rbnode *f = NULL;
rbnode *f = NULL, *ret = NULL;
int dir = 1, dir2, last;
@ -342,9 +342,7 @@ int rbtree_delete(rbtree *tree, const void *key) {
/* remove if found */
if (f) {
if (tree->delete_fn)
tree->delete_fn((void*)f->key);
ret = (void*)f->key;
if (f != q)
f->key = q->key;
swap(p, 1, q) = swap(q, 0, NULL);
@ -359,5 +357,5 @@ int rbtree_delete(rbtree *tree, const void *key) {
rb_assert(tree);
#endif
return f != NULL;
return ret;
}

2
src/rbtree.h
View file

@ -33,6 +33,6 @@ void rbtree_free(rbtree *tree);
int rbtree_insert(rbtree *tree, const void *key);
int rbtree_delete(rbtree *tree, const void *key);
void* rbtree_delete(rbtree *tree, const void *key);
#endif /* __RBTREE_H */