projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdate
[gnulib.git]
/
lib
/
gl_anytreehash_list2.h
diff --git
a/lib/gl_anytreehash_list2.h
b/lib/gl_anytreehash_list2.h
index
1b324e9
..
89cdb06
100644
(file)
--- a/
lib/gl_anytreehash_list2.h
+++ b/
lib/gl_anytreehash_list2.h
@@
-1,5
+1,5
@@
/* 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.
This program is free software; you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software; you can redistribute it and/or modify
@@
-31,13
+31,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
+102,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
+198,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. */