From dae121d9aa38626db9962ff02879b55eb7ca36bf Mon Sep 17 00:00:00 2001 From: antirez Date: Sat, 10 Apr 2010 11:14:11 +0200 Subject: [PATCH] dict.c fixed to play well with enabling/disabling of the hash table --- dict.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dict.c b/dict.c index 64e9eacf..150a0e3d 100644 --- a/dict.c +++ b/dict.c @@ -425,7 +425,7 @@ static int _dictExpandIfNeeded(dict *ht) if (ht->size == 0) return dictExpand(ht, DICT_HT_INITIAL_SIZE); if (ht->used >= ht->size && dict_can_resize) - return dictExpand(ht, ht->size*2); + return dictExpand(ht, ((ht->size > ht->used) ? ht->size : ht->used)*2); return DICT_OK; } @@ -519,7 +519,7 @@ void dictEnableResize(void) { } void dictDisableResize(void) { - dict_can_resize = 1; + dict_can_resize = 0; } /* ----------------------- StringCopy Hash Table Type ------------------------*/