projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops, fix typo in last patch.
[gnulib.git]
/
lib
/
gl_rbtree_oset.c
diff --git
a/lib/gl_rbtree_oset.c
b/lib/gl_rbtree_oset.c
index
12c8632
..
936709d
100644
(file)
--- a/
lib/gl_rbtree_oset.c
+++ b/
lib/gl_rbtree_oset.c
@@
-1,5
+1,5
@@
/* Ordered set data type implemented by a binary tree.
/* Ordered set data type implemented by a binary tree.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
-2007
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software; you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software; you can redistribute it and/or modify
@@
-542,8
+542,7
@@
static gl_oset_node_t
gl_tree_add_first (gl_oset_t set, const void *elt)
{
/* Create new node. */
gl_tree_add_first (gl_oset_t set, const void *elt)
{
/* Create new node. */
- gl_oset_node_t new_node =
- (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+ gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-578,8
+577,7
@@
static gl_oset_node_t
gl_tree_add_before (gl_oset_t set, gl_oset_node_t node, const void *elt)
{
/* Create new node. */
gl_tree_add_before (gl_oset_t set, gl_oset_node_t node, const void *elt)
{
/* Create new node. */
- gl_oset_node_t new_node =
- (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+ gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-607,8
+605,7
@@
static gl_oset_node_t
gl_tree_add_after (gl_oset_t set, gl_oset_node_t node, const void *elt)
{
/* Create new node. */
gl_tree_add_after (gl_oset_t set, gl_oset_node_t node, const void *elt)
{
/* Create new node. */
- gl_oset_node_t new_node =
- (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+ gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-752,6
+749,8
@@
gl_tree_remove_node (gl_oset_t set, gl_oset_node_t node)
}
set->count--;
}
set->count--;
+ if (set->base.dispose_fn != NULL)
+ set->base.dispose_fn (node->value);
free (node);
return true;
}
free (node);
return true;
}
@@
-796,6
+795,7
@@
const struct gl_oset_implementation gl_rbtree_oset_implementation =
gl_tree_create_empty,
gl_tree_size,
gl_tree_search,
gl_tree_create_empty,
gl_tree_size,
gl_tree_search,
+ gl_tree_search_atleast,
gl_tree_add,
gl_tree_remove,
gl_tree_oset_free,
gl_tree_add,
gl_tree_remove,
gl_tree_oset_free,