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_linkedhash_list.c
diff --git
a/lib/gl_linkedhash_list.c
b/lib/gl_linkedhash_list.c
index
7afecb5
..
467e411
100644
(file)
--- a/
lib/gl_linkedhash_list.c
+++ b/
lib/gl_linkedhash_list.c
@@
-1,5
+1,5
@@
/* 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, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008
-2010
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
@@
-23,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
@@
-62,6
+61,8
@@
add_to_bucket (gl_list_t list, gl_list_node_t node)
node->h.hash_next = list->table[bucket];
list->table[bucket] = &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 a node from the hash table structure. */
static inline void
@@
-73,14
+74,14
@@
remove_from_bucket (gl_list_t list, gl_list_node_t node)
for (p = &list->table[bucket]; ; p = &(*p)->hash_next)
{
if (*p == &node->h)
for (p = &list->table[bucket]; ; p = &(*p)->hash_next)
{
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 ();
}
}
}
}
@@
-90,22
+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_set_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_
nx_
set_at,
gl_linked_search_from_to,
gl_linked_indexof_from_to,
gl_linked_search_from_to,
gl_linked_indexof_from_to,
- gl_linked_add_first,
- gl_linked_add_last,
- gl_linked_add_before,
- gl_linked_add_after,
- gl_linked_add_at,
+ 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,
@@
-118,6
+119,6
@@
const struct gl_list_implementation gl_linkedhash_list_implementation =
gl_linked_sortedlist_search_from_to,
gl_linked_sortedlist_indexof,
gl_linked_sortedlist_indexof_from_to,
gl_linked_sortedlist_search_from_to,
gl_linked_sortedlist_indexof,
gl_linked_sortedlist_indexof_from_to,
- gl_linked_sortedlist_add,
+ gl_linked_sortedlist_
nx_
add,
gl_linked_sortedlist_remove
};
gl_linked_sortedlist_remove
};