Source Format Enforcement (#532)

[thirdparty/squid.git] / src / test_cache_digest.cc

diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc
index b67608832357635ff642a0a99b9f18dc16fb8a19..50418cd364988042f617d5988ef58fe29b9a4767 100644 (file)
--- a/src/test_cache_digest.cc
+++ b/src/test_cache_digest.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -233,9 +233,7 @@ cacheDestroy(Cache * cache)
     /* destroy the hash table itself */
     hashFreeMemory(hash);
 
-    if (cache->digest)
-        cacheDigestDestroy(cache->digest);
-
+    delete cache->digest;
     xfree(cache);
 }
 
@@ -251,12 +249,10 @@ cacheResetDigest(Cache * cache)
     assert(cache);
     fprintf(stderr, "%s: init-ing digest with %d entries\n", cache->name, cache->count);
 
-    if (cache->digest)
-        cacheDigestDestroy(cache->digest);
-
     hash = cache->hash;
 
-    cache->digest = cacheDigestCreate(cache->count + 1, 6);
+    delete cache->digest;
+    cache->digest = new CacheDigest(cache->count + 1, 6);
 
     if (!cache->count)
         return;
@@ -266,7 +262,7 @@ cacheResetDigest(Cache * cache)
     hash_first(hash);
 
     while ((e = (CacheEntry *)hash_next(hash))) {
-        cacheDigestAdd(cache->digest, e->key);
+        cache->digest->add(e->key);
     }
 
     gettimeofday(&t_end, NULL);
@@ -294,7 +290,7 @@ static void
 cacheQueryPeer(Cache * cache, const cache_key * key)
 {
     const int peer_has_it = hash_lookup(cache->peer->hash, key) != NULL;
-    const int we_think_we_have_it = cacheDigestTest(cache->digest, key);
+    const int we_think_we_have_it = cache->digest->test(key);
 
     ++ cache->qstats.query_count;
 
@@ -474,7 +470,7 @@ cachePurge(Cache * cache, storeSwapLogData * s, int update_digest)
         hash_remove_link(cache->hash, (hash_link *) olde);
 
         if (update_digest)
-            cacheDigestDel(cache->digest, s->key);
+            cache->digest->remove(s->key);
 
         cacheEntryDestroy(olde);
 
@@ -495,7 +491,7 @@ cacheStore(Cache * cache, storeSwapLogData * s, int update_digest)
         ++ cache->count;
 
         if (update_digest)
-            cacheDigestAdd(cache->digest, e->key);
+            cache->digest->add(e->key);
     }
 }
 
@@ -522,7 +518,7 @@ usage(const char *prg_name)
 {
     fprintf(stderr, "usage: %s <access_log> <swap_state> ...\n",
             prg_name);
-    return -1;
+    return EXIT_FAILURE;
 }
 
 int
@@ -585,7 +581,7 @@ main(int argc, char *argv[])
     /* digest peer cache content */
     cacheResetDigest(them);
 
-    us->digest = cacheDigestClone(them->digest);    /* @netw@ */
+    us->digest = them->digest->clone();
 
     /* shift the time in access log to match ready_time */
     fileIteratorSetCurTime(fis[0], ready_time);
@@ -637,6 +633,6 @@ main(int argc, char *argv[])
     xfree(fis);
     cacheDestroy(them);
     cacheDestroy(us);
-    return 0;
+    return EXIT_SUCCESS;
 }