X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_linkedhash_list.c;h=89173f51bc130ce550e8b2d47dfe9082052546d0;hb=a74dcd0c2df4149148181beea2a8b5190619dbbe;hp=ca7f7072f9f5675d47991482de8caab7fd4b46c1;hpb=2a6d8ef178c5e186886e079badb06016b5f48bb6;p=gnulib.git

diff --git a/lib/gl_linkedhash_list.c b/lib/gl_linkedhash_list.c
index ca7f7072f..89173f51b 100644
--- a/lib/gl_linkedhash_list.c
+++ b/lib/gl_linkedhash_list.c
@@ -16,18 +16,16 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "gl_linkedhash_list.h"
 
+#include <stdint.h> /* for SIZE_MAX */
 #include <stdlib.h>
 
 #include "xalloc.h"
 #include "xsize.h"
-#include "size_max.h"
 
 #ifndef uintptr_t
 # define uintptr_t unsigned long
@@ -60,20 +58,20 @@ hash_resize_after_add (gl_list_t list)
 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;
 }
 
 /* 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;
 
-  for (p = &list->table[index]; ; p = &(*p)->hash_next)
+  for (p = &list->table[bucket]; ; p = &(*p)->hash_next)
     {
       if (*p == &node->h)
 	{
@@ -101,8 +99,8 @@ const struct gl_list_implementation gl_linkedhash_list_implementation =
     gl_linked_previous_node,
     gl_linked_get_at,
     gl_linked_set_at,
-    gl_linked_search,
-    gl_linked_indexof,
+    gl_linked_search_from_to,
+    gl_linked_indexof_from_to,
     gl_linked_add_first,
     gl_linked_add_last,
     gl_linked_add_before,
@@ -117,7 +115,9 @@ const struct gl_list_implementation gl_linkedhash_list_implementation =
     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_from_to,
     gl_linked_sortedlist_add,
     gl_linked_sortedlist_remove
   };