projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update or remove references to gettext release.
[gnulib.git]
/
lib
/
gl_anytree_oset.h
diff --git
a/lib/gl_anytree_oset.h
b/lib/gl_anytree_oset.h
index
9945cfc
..
95f2124
100644
(file)
--- a/
lib/gl_anytree_oset.h
+++ b/
lib/gl_anytree_oset.h
@@
-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/>. */
/* Common code of gl_avltree_oset.c and gl_rbtree_oset.c. */
/* Common code of gl_avltree_oset.c and gl_rbtree_oset.c. */
@@
-30,12
+29,14
@@
typedef iterstack_item_t iterstack_t[MAXHEIGHT];
static gl_oset_t
gl_tree_create_empty (gl_oset_implementation_t implementation,
static gl_oset_t
gl_tree_create_empty (gl_oset_implementation_t implementation,
- gl_setelement_compar_fn compar_fn)
+ gl_setelement_compar_fn compar_fn,
+ gl_setelement_dispose_fn dispose_fn)
{
struct gl_oset_impl *set = XMALLOC (struct gl_oset_impl);
set->base.vtable = implementation;
set->base.compar_fn = compar_fn;
{
struct gl_oset_impl *set = XMALLOC (struct gl_oset_impl);
set->base.vtable = implementation;
set->base.compar_fn = compar_fn;
+ set->base.dispose_fn = dispose_fn;
set->root = NULL;
set->count = 0;
set->root = NULL;
set->count = 0;
@@
-100,7
+101,7
@@
gl_tree_search_atleast (gl_oset_t set,
node = node->left;
}
}
node = node->left;
}
}
- *eltp = found;
+ *eltp = found
->value
;
return true;
}
}
return true;
}
}
@@
-216,6
+217,8
@@
gl_tree_oset_free (gl_oset_t set)
if (!stack_ptr->rightp)
break;
/* Free the current node. */
if (!stack_ptr->rightp)
break;
/* Free the current node. */
+ if (set->base.dispose_fn != NULL)
+ set->base.dispose_fn (node->value);
free (node);
}
/* Descend on right branch. */
free (node);
}
/* Descend on right branch. */