From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 5 Nov 2015 16:27:43 +0000 (-0800)
Subject: Convert cacheDigestClear() to method
X-Git-Tag: SQUID_4_0_3~18^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28faff329b859d3fa841340290b6b3eab655a701;p=thirdparty%2Fsquid.git

Convert cacheDigestClear() to method
---

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index bafc01a0a9..7ddb78c900 100644
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -79,11 +79,10 @@ CacheDigest::clone() const
 }
 
 void
-cacheDigestClear(CacheDigest * cd)
+CacheDigest::clear()
 {
-    assert(cd);
-    cd->count = cd->del_count = 0;
-    memset(cd->mask, 0, cd->mask_size);
+    count = del_count = 0;
+    memset(mask, 0, mask_size);
 }
 
 /* changes mask size, resets bits to 0, preserves "cd" pointer */
diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 40bf14a014..35da804697 100644
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -28,6 +28,9 @@ public:
     /// produce a new identical copy of the digest object
     CacheDigest *clone() const;
 
+    /// reset the digest mask and counters
+    void clear();
+
 public:
     /* public, read-only */
     char *mask;         /* bit mask */
@@ -38,7 +41,6 @@ public:
     int del_count;      /* number of deletions performed so far */
 };
 
-void cacheDigestClear(CacheDigest * cd);
 void cacheDigestChangeCap(CacheDigest * cd, int new_cap);
 int cacheDigestTest(const CacheDigest * cd, const cache_key * key);
 void cacheDigestAdd(CacheDigest * cd, const cache_key * key);
diff --git a/src/store_digest.cc b/src/store_digest.cc
index a9bf140286..07d07ca7c7 100644
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -301,7 +301,7 @@ storeDigestRebuildResume(void)
     /* resize or clear */
 
     if (!storeDigestResize())
-        cacheDigestClear(store_digest);     /* not clean()! */
+        store_digest->clear();     /* not clean()! */
 
     memset(&sd_stats, 0, sizeof(sd_stats));
 
diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc
index 685cbeb4e5..316f0b5075 100644
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@ -20,7 +20,7 @@ class StoreEntry;
 CacheDigest::CacheDigest(int, int) {STUB}
 CacheDigest::~CacheDigest() {STUB}
 CacheDigest *CacheDigest::clone() const STUB_RETVAL(nullptr)
-void cacheDigestClear(CacheDigest * ) STUB
+void CacheDigest::clear() STUB
 void cacheDigestChangeCap(CacheDigest *,int) STUB
 int cacheDigestTest(const CacheDigest *, const cache_key *) STUB_RETVAL(1)
 void cacheDigestAdd(CacheDigest *, const cache_key *) STUB