[svn] Mark entries as deleted with the correct marker.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c422f9b007785410088293cde9f1e1412ac63f2..85b6c5cb76ccc5a270ce4f841e4628e282b55895 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
        (grow_hash_table): Extract ht->hash_function outside the loop.
        (hash_table_remove): Ditto.
        (hash_table_clear): Fill entries with 0xff to clear them.
+       (hash_table_remove): Mark entries as deleted with the correct
+       marker.
 
 2003-11-08  Hrvoje Niksic  <hniksic@xemacs.org>
 

diff --git a/src/hash.c b/src/hash.c
index b7b73fdc38b72a6096e22dab52d82e3c8e75b2d6..2c8d1351bb167bb4c9f5d1008b2c59210d89fa5a 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -161,7 +161,9 @@ struct hash_table {
 /* We use all-bit-set marker to mean that a mapping is empty.  It is
    (hopefully) illegal as a pointer, and it allows the users to use
    NULL (as well as any non-negative integer) as key.  */
+
 #define NON_EMPTY(mp) (mp->key != (void *)~(unsigned long)0)
+#define MARK_AS_EMPTY(mp) (mp->key = (void *)~(unsigned long)0)
 
 /* "Next" mapping is the mapping after MP, but wrapping back to
    MAPPINGS when MP would reach MAPPINGS+SIZE.  */
@@ -438,7 +440,7 @@ hash_table_remove (struct hash_table *ht, const void *key)
       struct mapping *mappings = ht->mappings;
       hashfun_t hasher = ht->hash_function;
 
-      mp->key = NULL;
+      MARK_AS_EMPTY (mp);
       --ht->count;
 
       /* Rehash all the entries following MP.  The alternative
@@ -461,7 +463,7 @@ hash_table_remove (struct hash_table *ht, const void *key)
              goto next_rehash;
 
          *mp_new = *mp;
-         mp->key = NULL;
+         MARK_AS_EMPTY (mp);
 
        next_rehash:
          ;