projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'posix_spawnattr_destroy'.
[gnulib.git]
/
lib
/
gl_anyavltree_list2.h
diff --git
a/lib/gl_anyavltree_list2.h
b/lib/gl_anyavltree_list2.h
index
5a73158
..
f468688
100644
(file)
--- a/
lib/gl_anyavltree_list2.h
+++ b/
lib/gl_anyavltree_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_avltree_list.c and gl_avltreehash_list.c. */
/* Common code of gl_avltree_list.c and gl_avltreehash_list.c. */
@@
-63,6
+62,7
@@
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)
{
@@
-71,6
+71,7
@@
gl_tree_create (gl_list_implementation_t implementation,
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
{
@@
-738,6
+739,8
@@
gl_tree_remove_node (gl_list_t list, gl_list_node_t node)
rebalance (list, child, -1, subst_parent != node ? subst_parent : subst);
}
rebalance (list, child, -1, subst_parent != node ? subst_parent : subst);
}
+ if (list->base.dispose_fn != NULL)
+ list->base.dispose_fn (node->value);
free (node);
return true;
}
free (node);
return true;
}