From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 5 Nov 2015 17:01:26 +0000 (-0800)
Subject: Remove unnecessary modification of bits_per_entry
X-Git-Tag: SQUID_4_0_3~18^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28d197c43c8606c0a15c8ee890766e647c230e74;p=thirdparty%2Fsquid.git

Remove unnecessary modification of bits_per_entry
---

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 7b59c64eae..84cd5a0098 100644
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -35,14 +35,13 @@ static void cacheDigestHashKey(const CacheDigest * cd, const cache_key * key);
 static uint32_t hashed_keys[4];
 
 static void
-cacheDigestInit(CacheDigest * cd, int capacity, int bpe)
+cacheDigestInit(CacheDigest * cd, int capacity)
 {
-    const size_t mask_size = cacheDigestCalcMaskSize(capacity, bpe);
+    const size_t mask_size = cacheDigestCalcMaskSize(capacity, cd->bits_per_entry);
     assert(cd);
-    assert(capacity > 0 && bpe > 0);
+    assert(capacity > 0 && cd->bits_per_entry > 0);
     assert(mask_size > 0);
     cd->capacity = capacity;
-    cd->bits_per_entry = bpe;
     cd->mask_size = mask_size;
     cd->mask = (char *)xcalloc(cd->mask_size, 1);
     debugs(70, 2, "cacheDigestInit: capacity: " << cd->capacity << " entries, bpe: " << cd->bits_per_entry << "; size: "
@@ -89,7 +88,7 @@ void
 CacheDigest::updateCapacity(int newCapacity)
 {
     safe_free(mask);
-    cacheDigestInit(this, newCapacity, bits_per_entry); // will re-init mask and mask_size
+    cacheDigestInit(this, newCapacity); // will re-init mask and mask_size
 }
 
 /* returns true if the key belongs to the digest */