projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant AC_SUBST invocation.
[gnulib.git]
/
lib
/
gl_linkedhash_list.c
diff --git
a/lib/gl_linkedhash_list.c
b/lib/gl_linkedhash_list.c
index
bcd46e1
..
467e411
100644
(file)
--- a/
lib/gl_linkedhash_list.c
+++ b/
lib/gl_linkedhash_list.c
@@
-1,11
+1,11
@@
/* Sequential list data type implemented by a hash table with a linked list.
/* Sequential list data type implemented by a hash table with a linked list.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 2008-2010
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/>. */
#include <config.h>
#include <config.h>
@@
-24,7
+23,6
@@
#include <stdint.h> /* for SIZE_MAX */
#include <stdlib.h>
#include <stdint.h> /* for SIZE_MAX */
#include <stdlib.h>
-#include "xalloc.h"
#include "xsize.h"
#ifndef uintptr_t
#include "xsize.h"
#ifndef uintptr_t
@@
-58,30
+56,32
@@
hash_resize_after_add (gl_list_t list)
static inline void
add_to_bucket (gl_list_t list, gl_list_node_t node)
{
static inline void
add_to_bucket (gl_list_t list, gl_list_node_t node)
{
- size_t
index
= node->h.hashcode % list->table_size;
+ size_t
bucket
= node->h.hashcode % list->table_size;
- node->h.hash_next = list->table[
index
];
- list->table[
index
] = &node->h;
+ node->h.hash_next = list->table[
bucket
];
+ list->table[
bucket
] = &node->h;
}
}
+/* Tell all compilers that the return value is 0. */
+#define add_to_bucket(list,node) ((add_to_bucket) (list, node), 0)
/* Remove a node from the hash table structure. */
static inline void
remove_from_bucket (gl_list_t list, gl_list_node_t node)
{
/* Remove a node from the hash table structure. */
static inline void
remove_from_bucket (gl_list_t list, gl_list_node_t node)
{
- size_t
index
= node->h.hashcode % list->table_size;
+ size_t
bucket
= node->h.hashcode % list->table_size;
gl_hash_entry_t *p;
gl_hash_entry_t *p;
- for (p = &list->table[
index
]; ; p = &(*p)->hash_next)
+ for (p = &list->table[
bucket
]; ; p = &(*p)->hash_next)
{
if (*p == &node->h)
{
if (*p == &node->h)
- {
- *p = node->h.hash_next;
- break;
- }
+
{
+
*p = node->h.hash_next;
+
break;
+
}
if (*p == NULL)
if (*p == NULL)
- /* node is not in the right bucket. Did the hash codes
- change inadvertently? */
- abort ();
+
/* node is not in the right bucket. Did the hash codes
+
change inadvertently? */
+
abort ();
}
}
}
}
@@
-91,21
+91,22
@@
remove_from_bucket (gl_list_t list, gl_list_node_t node)
const struct gl_list_implementation gl_linkedhash_list_implementation =
{
const struct gl_list_implementation gl_linkedhash_list_implementation =
{
- gl_linked_create_empty,
- gl_linked_create,
+ gl_linked_
nx_
create_empty,
+ gl_linked_
nx_
create,
gl_linked_size,
gl_linked_node_value,
gl_linked_size,
gl_linked_node_value,
+ gl_linked_node_nx_set_value,
gl_linked_next_node,
gl_linked_previous_node,
gl_linked_get_at,
gl_linked_next_node,
gl_linked_previous_node,
gl_linked_get_at,
- gl_linked_set_at,
- gl_linked_search,
- gl_linked_indexof,
- gl_linked_add_first,
- gl_linked_add_last,
- gl_linked_add_before,
- gl_linked_add_after,
- gl_linked_add_at,
+ gl_linked_
nx_
set_at,
+ gl_linked_search
_from_to
,
+ gl_linked_indexof
_from_to
,
+ gl_linked_
nx_
add_first,
+ gl_linked_
nx_
add_last,
+ gl_linked_
nx_
add_before,
+ gl_linked_
nx_
add_after,
+ gl_linked_
nx_
add_at,
gl_linked_remove_node,
gl_linked_remove_at,
gl_linked_remove,
gl_linked_remove_node,
gl_linked_remove_at,
gl_linked_remove,
@@
-115,7
+116,9
@@
const struct gl_list_implementation gl_linkedhash_list_implementation =
gl_linked_iterator_next,
gl_linked_iterator_free,
gl_linked_sortedlist_search,
gl_linked_iterator_next,
gl_linked_iterator_free,
gl_linked_sortedlist_search,
+ gl_linked_sortedlist_search_from_to,
gl_linked_sortedlist_indexof,
gl_linked_sortedlist_indexof,
- gl_linked_sortedlist_add,
+ gl_linked_sortedlist_indexof_from_to,
+ gl_linked_sortedlist_nx_add,
gl_linked_sortedlist_remove
};
gl_linked_sortedlist_remove
};