projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make xnanosleep's integer overflow test more robust.
[gnulib.git]
/
lib
/
gl_avltree_oset.c
diff --git
a/lib/gl_avltree_oset.c
b/lib/gl_avltree_oset.c
index
ac1185c
..
6ac058d
100644
(file)
--- a/
lib/gl_avltree_oset.c
+++ b/
lib/gl_avltree_oset.c
@@
-1,11
+1,11
@@
/* 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.
Written by Bruno Haible <bruno@clisp.org>, 2006.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
@@
-310,8
+309,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;
@@
-348,8
+346,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);
bool height_inc;
new_node->left = NULL;
bool height_inc;
new_node->left = NULL;
@@
-386,8
+383,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);
bool height_inc;
new_node->left = NULL;
bool height_inc;
new_node->left = NULL;
@@
-522,6
+518,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;
}
@@
-565,6
+563,7
@@
const struct gl_oset_implementation gl_avltree_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,