dnsdist: Fix wrong type (bool vs size_t) and typos in the tests

diff --git a/pdns/dnsdist-cache.cc b/pdns/dnsdist-cache.cc
index 5342f93b23488e21735296341af11c6843b49ef2..a359ea8a2a0a26ba4158bc7630c97d6acdcf0169 100644 (file)
--- a/pdns/dnsdist-cache.cc
+++ b/pdns/dnsdist-cache.cc
@@ -335,7 +335,7 @@ size_t DNSDistPacketCache::purgeExpired(size_t upTo)
    entries in the cache */
 size_t DNSDistPacketCache::expunge(size_t upTo)
 {
-  bool removed = 0;
+  size_t removed = 0;
   const uint64_t size = getSize();
 
   if (upTo >= size) {

diff --git a/pdns/dnsdistdist/test-dnsdistrules_cc.cc b/pdns/dnsdistdist/test-dnsdistrules_cc.cc
index a669c941ff4608de9c018a5f02749a7508ed90dd..cd2a22158d5044d7e706d1240bd62fc3717d8231 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistrules_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistrules_cc.cc
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(test_MaxQPSIPRule) {
   BOOST_CHECK_EQUAL(rule.matches(&dq), true);
   BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1);
 
-  /* remove all entries that have not been since 'now' + 1,
+  /* remove all entries that have not been updated since 'now' + 1,
      so all of them */
   expiredTime.tv_sec += 1;
   rule.cleanup(expiredTime);

diff --git a/pdns/test-dnsdistpacketcache_cc.cc b/pdns/test-dnsdistpacketcache_cc.cc
index a82600d073690b21f756d893d181cef8d338cc2b..38d35dfdf3e0516979add623b7d54e29ca70423b 100644 (file)
--- a/pdns/test-dnsdistpacketcache_cc.cc
+++ b/pdns/test-dnsdistpacketcache_cc.cc
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheSimple) {
       }
     }
 
-    /* in the unlikely event that the test took so long that entries did expire.. */
+    /* in the unlikely event that the test took so long that the entries did expire.. */
     auto expired = PC.purgeExpired();
     BOOST_CHECK_EQUAL(matches + expired, expected);