From d6a57bc2a632096c0625d50070645f359d79bc9c Mon Sep 17 00:00:00 2001 From: hniksic Date: Tue, 21 Nov 2000 08:42:29 -0800 Subject: [PATCH] [svn] Commit hash table bugfix. Published in . --- src/ChangeLog | 4 ++++ src/hash.c | 20 +++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 642f94a8..7ec215bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2000-11-21 Hrvoje Niksic + + * hash.c (hash_table_put): Don't overwrite deleted mappings. + 2000-11-21 Hrvoje Niksic * hash.c (find_mapping): New function. diff --git a/src/hash.c b/src/hash.c index 0749f57b..705d8d3f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -329,8 +329,8 @@ grow_hash_table (struct hash_table *ht) void hash_table_put (struct hash_table *ht, const void *key, void *value) { - /* Cannot use find_mapping here because we treat deleted entries - specially. */ + /* Cannot use find_mapping here because we're actually looking for + an *empty* entry. */ struct mapping *mappings = ht->mappings; int size = ht->size; @@ -349,24 +349,18 @@ hash_table_put (struct hash_table *ht, const void *key, void *value) mp->value = value; break; } - else if (DELETED_ENTRY_P (mp_key)) + else if (DELETED_ENTRY_P (mp_key) + || !ht->test_function (key, mp_key)) { - /* We're replacing a deleteed entry, so ht->count gets - increased, but ht->fullness remains unchanged. */ - ++ht->count; - goto just_insert; + if (++location == size) + location = 0; } - else if (ht->test_function (key, mp_key)) + else /* equal to key and not deleted */ { /* We're replacing an existing entry, so ht->count and ht->fullness remain unchanged. */ goto just_insert; } - else - { - if (++location == size) - location = 0; - } } if (ht->fullness * 4 > ht->size * 3) /* When fullness exceeds 75% of size, regrow the table. */ -- 2.39.2