projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable the fpucw handling also for x86_64.
[gnulib.git]
/
lib
/
gl_anytreehash_list2.h
diff --git
a/lib/gl_anytreehash_list2.h
b/lib/gl_anytreehash_list2.h
index
1b324e9
..
4e22bb7
100644
(file)
--- a/
lib/gl_anytreehash_list2.h
+++ b/
lib/gl_anytreehash_list2.h
@@
-1,11
+1,11
@@
/* Sequential list data type implemented by a hash table with a binary tree.
/* Sequential list data type implemented by a hash table with 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_avltreehash_list.c and gl_rbtreehash_list.c. */
/* Common code of gl_avltreehash_list.c and gl_rbtreehash_list.c. */
@@
-31,13
+30,13
@@
gl_tree_search_from_to (gl_list_t list, size_t start_index, size_t end_index,
(list->base.hashcode_fn != NULL
? list->base.hashcode_fn (elt)
: (size_t)(uintptr_t) elt);
(list->base.hashcode_fn != NULL
? list->base.hashcode_fn (elt)
: (size_t)(uintptr_t) elt);
- size_t
index
= hashcode % list->table_size;
+ size_t
bucket
= hashcode % list->table_size;
gl_listelement_equals_fn equals = list->base.equals_fn;
gl_hash_entry_t entry;
if (list->base.allow_duplicates)
{
gl_listelement_equals_fn equals = list->base.equals_fn;
gl_hash_entry_t entry;
if (list->base.allow_duplicates)
{
- for (entry = list->table[
index
]; entry != NULL; entry = entry->hash_next)
+ for (entry = list->table[
bucket
]; entry != NULL; entry = entry->hash_next)
if (entry->hashcode == hashcode)
{
if (((struct gl_multiple_nodes *) entry)->magic == MULTIPLE_NODES_MAGIC)
if (entry->hashcode == hashcode)
{
if (((struct gl_multiple_nodes *) entry)->magic == MULTIPLE_NODES_MAGIC)
@@
-102,7
+101,7
@@
gl_tree_search_from_to (gl_list_t list, size_t start_index, size_t end_index,
else
{
/* If no duplicates are allowed, multiple nodes are not needed. */
else
{
/* If no duplicates are allowed, multiple nodes are not needed. */
- for (entry = list->table[
index
]; entry != NULL; entry = entry->hash_next)
+ for (entry = list->table[
bucket
]; entry != NULL; entry = entry->hash_next)
if (entry->hashcode == hashcode)
{
gl_list_node_t node = (struct gl_list_node_impl *) entry;
if (entry->hashcode == hashcode)
{
gl_list_node_t node = (struct gl_list_node_impl *) entry;
@@
-198,6
+197,8
@@
gl_tree_list_free (gl_list_t list)
if (!stack_ptr->rightp)
break;
/* Free the current node. */
if (!stack_ptr->rightp)
break;
/* Free the current node. */
+ if (list->base.dispose_fn != NULL)
+ list->base.dispose_fn (node->value);
free (node);
}
/* Descend on right branch. */
free (node);
}
/* Descend on right branch. */