From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 18 Nov 2015 13:25:29 +0000 (-0800)
Subject: Rename CacheDigest::test() to CacheDigest::contains()
X-Git-Tag: SQUID_4_0_3~18^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fc4e508dc046cf1dab7742248055b709ae7f908;p=thirdparty%2Fsquid.git

Rename CacheDigest::test() to CacheDigest::contains()
---

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 9f27a76d2c..640f8560cd 100644
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -90,7 +90,7 @@ CacheDigest::updateCapacity(int newCapacity)
 }
 
 bool
-CacheDigest::test(const cache_key * key) const
+CacheDigest::contains(const cache_key * key) const
 {
     assert(key);
     /* hash */
diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 68c0b6c490..b260311c0f 100644
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -38,7 +38,7 @@ public:
     void remove(const cache_key * key);
 
     /// \returns true if the key belongs to the digest
-    bool test(const cache_key * key) const;
+    bool contains(const cache_key * key) const;
 
     /// percentage of mask bits which are used
     double usedMaskPercent() const;
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 31ab13fcdd..fd819b1639 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -762,7 +762,7 @@ peerDigestLookup(CachePeer * p, HttpRequest * request)
     assert(p->digest->cd);
     /* does digest predict a hit? */
 
-    if (!p->digest->cd->test(key))
+    if (!p->digest->cd->contains(key))
         return LOOKUP_MISS;
 
     debugs(15, 5, "peerDigestLookup: peer " << p->host << " says HIT!");
diff --git a/src/store_digest.cc b/src/store_digest.cc
index a7c8f37b11..e2101c6d79 100644
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -147,7 +147,7 @@ storeDigestDel(const StoreEntry * entry)
     debugs(71, 6, "storeDigestDel: checking entry, key: " << entry->getMD5Text());
 
     if (!EBIT_TEST(entry->flags, KEY_PRIVATE)) {
-        if (!store_digest->test(static_cast<const cache_key *>(entry->key))) {
+        if (!store_digest->contains(static_cast<const cache_key *>(entry->key))) {
             ++sd_stats.del_lost_count;
             debugs(71, 6, "storeDigestDel: lost entry, key: " << entry->getMD5Text() << " url: " << entry->url()  );
         } else {
@@ -254,7 +254,7 @@ storeDigestAdd(const StoreEntry * entry)
     if (storeDigestAddable(entry)) {
         ++sd_stats.add_count;
 
-        if (store_digest->test(static_cast<const cache_key *>(entry->key)))
+        if (store_digest->contains(static_cast<const cache_key *>(entry->key)))
             ++sd_stats.add_coll_count;
 
         store_digest->add(static_cast<const cache_key *>(entry->key));
@@ -263,7 +263,7 @@ storeDigestAdd(const StoreEntry * entry)
     } else {
         ++sd_stats.rej_count;
 
-        if (store_digest->test(static_cast<const cache_key *>(entry->key)))
+        if (store_digest->contains(static_cast<const cache_key *>(entry->key)))
             ++sd_stats.rej_coll_count;
     }
 }