projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'unicase/u16-is-uppercase'.
[gnulib.git]
/
lib
/
gl_anyrbtree_list2.h
diff --git
a/lib/gl_anyrbtree_list2.h
b/lib/gl_anyrbtree_list2.h
index
07eebcd
..
09e8421
100644
(file)
--- a/
lib/gl_anyrbtree_list2.h
+++ b/
lib/gl_anyrbtree_list2.h
@@
-1,11
+1,11
@@
/* Sequential list data type implemented by a binary tree.
/* Sequential list 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/>. */
/* Common code of gl_rbtree_list.c and gl_rbtreehash_list.c. */
/* Common code of gl_rbtree_list.c and gl_rbtreehash_list.c. */
@@
-31,8
+30,7
@@
create_subtree_with_contents (unsigned int bh,
size_t half1 = (count - 1) / 2;
size_t half2 = count / 2;
/* Note: half1 + half2 = count - 1. */
size_t half1 = (count - 1) / 2;
size_t half2 = count / 2;
/* Note: half1 + half2 = count - 1. */
- gl_list_node_t node =
- (struct gl_list_node_impl *) xmalloc (sizeof (struct gl_list_node_impl));
+ gl_list_node_t node = XMALLOC (struct gl_list_node_impl);
if (half1 > 0)
{
if (half1 > 0)
{
@@
-69,15
+67,16
@@
static gl_list_t
gl_tree_create (gl_list_implementation_t implementation,
gl_listelement_equals_fn equals_fn,
gl_listelement_hashcode_fn hashcode_fn,
gl_tree_create (gl_list_implementation_t implementation,
gl_listelement_equals_fn equals_fn,
gl_listelement_hashcode_fn hashcode_fn,
+ gl_listelement_dispose_fn dispose_fn,
bool allow_duplicates,
size_t count, const void **contents)
{
bool allow_duplicates,
size_t count, const void **contents)
{
- struct gl_list_impl *list =
- (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+ struct gl_list_impl *list = XMALLOC (struct gl_list_impl);
list->base.vtable = implementation;
list->base.equals_fn = equals_fn;
list->base.hashcode_fn = hashcode_fn;
list->base.vtable = implementation;
list->base.equals_fn = equals_fn;
list->base.hashcode_fn = hashcode_fn;
+ list->base.dispose_fn = dispose_fn;
list->base.allow_duplicates = allow_duplicates;
#if WITH_HASHTABLE
{
list->base.allow_duplicates = allow_duplicates;
#if WITH_HASHTABLE
{
@@
-85,8
+84,7
@@
gl_tree_create (gl_list_implementation_t implementation,
if (estimate < 10)
estimate = 10;
list->table_size = next_prime (estimate);
if (estimate < 10)
estimate = 10;
list->table_size = next_prime (estimate);
- list->table =
- (gl_hash_entry_t *) xzalloc (list->table_size * sizeof (gl_hash_entry_t));
+ list->table = XCALLOC (list->table_size, gl_hash_entry_t);
}
#endif
if (count > 0)
}
#endif
if (count > 0)
@@
-599,8
+597,7
@@
static gl_list_node_t
gl_tree_add_first (gl_list_t list, const void *elt)
{
/* Create new node. */
gl_tree_add_first (gl_list_t list, const void *elt)
{
/* Create new node. */
- gl_list_node_t new_node =
- (struct gl_list_node_impl *) xmalloc (sizeof (struct gl_list_node_impl));
+ gl_list_node_t new_node = XMALLOC (struct gl_list_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-657,8
+654,7
@@
static gl_list_node_t
gl_tree_add_last (gl_list_t list, const void *elt)
{
/* Create new node. */
gl_tree_add_last (gl_list_t list, const void *elt)
{
/* Create new node. */
- gl_list_node_t new_node =
- (struct gl_list_node_impl *) xmalloc (sizeof (struct gl_list_node_impl));
+ gl_list_node_t new_node = XMALLOC (struct gl_list_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-715,8
+711,7
@@
static gl_list_node_t
gl_tree_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
{
/* Create new node. */
gl_tree_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
{
/* Create new node. */
- gl_list_node_t new_node =
- (struct gl_list_node_impl *) xmalloc (sizeof (struct gl_list_node_impl));
+ gl_list_node_t new_node = XMALLOC (struct gl_list_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-766,8
+761,7
@@
static gl_list_node_t
gl_tree_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
{
/* Create new node. */
gl_tree_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
{
/* Create new node. */
- gl_list_node_t new_node =
- (struct gl_list_node_impl *) xmalloc (sizeof (struct gl_list_node_impl));
+ gl_list_node_t new_node = XMALLOC (struct gl_list_node_impl);
new_node->left = NULL;
new_node->right = NULL;
new_node->left = NULL;
new_node->right = NULL;
@@
-966,6
+960,8
@@
gl_tree_remove_node (gl_list_t list, gl_list_node_t node)
}
}
}
}
+ if (list->base.dispose_fn != NULL)
+ list->base.dispose_fn (node->value);
free (node);
return true;
}
free (node);
return true;
}