.

[gnulib.git] / lib / hash.c

diff --git a/lib/hash.c b/lib/hash.c
index 0dc37d9..3948ce4 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,5 +1,8 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+   Foundation, Inc.
+
    Written by Jim Meyering, 1992.
 
    This program is free software; you can redistribute it and/or modify
@@ -24,29 +27,11 @@
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-typedef enum {false = 0, true = 1} bool;
-#endif
-#include <stdio.h>
 
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
-
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
-#endif
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #if USE_OBSTACK
 # include "obstack.h"
@@ -262,7 +247,7 @@ hash_lookup (const Hash_table *table, const void *entry)
     = table->bucket + table->hasher (entry, table->n_buckets);
   struct hash_entry *cursor;
 
-  if (table->bucket_limit <= bucket)
+  if (! (bucket < table->bucket_limit))
     abort ();
 
   if (bucket->data == NULL)
@@ -293,7 +278,7 @@ hash_get_first (const Hash_table *table)
     return NULL;
 
   for (bucket = table->bucket; ; bucket++)
-    if (table->bucket_limit <= bucket)
+    if (! (bucket < table->bucket_limit))
       abort ();
     else if (bucket->data)
       return bucket->data;
@@ -310,7 +295,7 @@ hash_get_next (const Hash_table *table, const void *entry)
     = table->bucket + table->hasher (entry, table->n_buckets);
   struct hash_entry *cursor;
 
-  if (table->bucket_limit <= bucket)
+  if (! (bucket < table->bucket_limit))
     abort ();
 
   /* Find next entry in the same bucket.  */
@@ -403,9 +388,6 @@ hash_do_for_each (const Hash_table *table, Hash_processor processor,
 unsigned
 hash_string (const char *string, unsigned n_buckets)
 {
-# ifndef CHAR_BIT
-#  define CHAR_BIT 8
-# endif
 # define ROTATE_LEFT(Value, Shift) \
   ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift)))
 # define HASH_ONE_CHAR(Value, Byte) \
@@ -754,7 +736,7 @@ hash_find_entry (Hash_table *table, const void *entry,
     = table->bucket + table->hasher (entry, table->n_buckets);
   struct hash_entry *cursor;
 
-  if (table->bucket_limit <= bucket)
+  if (! (bucket < table->bucket_limit))
     abort ();
 
   *bucket_head = bucket;
@@ -850,7 +832,7 @@ hash_rehash (Hash_table *table, unsigned candidate)
            = (new_table->bucket
               + new_table->hasher (data, new_table->n_buckets));
 
-         if (new_table->bucket_limit <= new_bucket)
+         if (! (new_bucket < new_table->bucket_limit))
            abort ();
 
          next = cursor->next;