[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-gnulib] hash.c change to use abort rather than assert
From: |
Paul Eggert |
Subject: |
[Bug-gnulib] hash.c change to use abort rather than assert |
Date: |
Fri, 22 Nov 2002 23:06:21 -0800 (PST) |
In Bison we recently removed all uses of 'assert' in favor of 'abort'.
Bison uses hash.c so I installed this change into gnulib/lib/hash.c.
If anybody feels that this is a mistake, and that we should use assert
anyway, please let me know and I can revert the change.
2002-11-22 Paul Eggert <address@hidden>
* hash.c: Avoid use of <assert.h>, as the GNU Coding Standards
hint that one should use `if (! x) abort ();' rather than `assert
(x);', and anyway it's one less thing to worry about configuring.
(hash_lookup, hash_get_first, hash_get_next, hash_find_entry,
hash_rehash, hash_insert): Use abort rather than assert.
Index: hash.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/hash.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -p -u -r1.28 -r1.29
--- hash.c 23 Nov 2001 08:09:14 -0000 1.28
+++ hash.c 23 Nov 2002 07:02:40 -0000 1.29
@@ -1,5 +1,5 @@
/* hash - hashing table processing.
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Written by Jim Meyering, 1992.
This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,6 @@
typedef enum {false = 0, true = 1} bool;
#endif
#include <stdio.h>
-#include <assert.h>
#ifndef HAVE_DECL_FREE
"this configure-time declaration test was not run"
@@ -263,7 +262,8 @@ hash_lookup (const Hash_table *table, co
= table->bucket + table->hasher (entry, table->n_buckets);
struct hash_entry *cursor;
- assert (bucket < table->bucket_limit);
+ if (table->bucket_limit <= bucket)
+ abort ();
if (bucket->data == NULL)
return NULL;
@@ -292,12 +292,11 @@ hash_get_first (const Hash_table *table)
if (table->n_entries == 0)
return NULL;
- for (bucket = table->bucket; bucket < table->bucket_limit; bucket++)
- if (bucket->data)
+ for (bucket = table->bucket; ; bucket++)
+ if (table->bucket_limit <= bucket)
+ abort ();
+ else if (bucket->data)
return bucket->data;
-
- assert (0);
- return NULL;
}
/* Return the user data for the entry following ENTRY, where ENTRY has been
@@ -311,7 +310,8 @@ hash_get_next (const Hash_table *table,
= table->bucket + table->hasher (entry, table->n_buckets);
struct hash_entry *cursor;
- assert (bucket < table->bucket_limit);
+ if (table->bucket_limit <= bucket)
+ abort ();
/* Find next entry in the same bucket. */
for (cursor = bucket; cursor; cursor = cursor->next)
@@ -754,7 +754,9 @@ hash_find_entry (Hash_table *table, cons
= table->bucket + table->hasher (entry, table->n_buckets);
struct hash_entry *cursor;
- assert (bucket < table->bucket_limit);
+ if (table->bucket_limit <= bucket)
+ abort ();
+
*bucket_head = bucket;
/* Test for empty bucket. */
@@ -848,7 +850,9 @@ hash_rehash (Hash_table *table, unsigned
= (new_table->bucket
+ new_table->hasher (data, new_table->n_buckets));
- assert (new_bucket < new_table->bucket_limit);
+ if (new_table->bucket_limit <= new_bucket)
+ abort ();
+
next = cursor->next;
if (new_bucket->data)
@@ -912,7 +916,9 @@ hash_insert (Hash_table *table, const vo
void *data;
struct hash_entry *bucket;
- assert (entry); /* cannot insert a NULL entry */
+ /* The caller cannot insert a NULL entry. */
+ if (! entry)
+ abort ();
/* If there's a matching entry already in the table, return that. */
if ((data = hash_find_entry (table, entry, &bucket, false)) != NULL)
- [Bug-gnulib] hash.c change to use abort rather than assert,
Paul Eggert <=