dnsdist: More delinting

diff --git a/pdns/dnsdistdist/dnsdist-dynblocks.cc b/pdns/dnsdistdist/dnsdist-dynblocks.cc
index e09130a530bed0b81e7dd5201b75917610651bd7..f0bb97f69c9cd1b0b23a3b3fb241bd0efba2acc2 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-dynblocks.cc
+++ b/pdns/dnsdistdist/dnsdist-dynblocks.cc
@@ -855,7 +855,7 @@ bool DynBlockRulesGroup::DynBlockRule::matches(const struct timespec& when)
     return false;
   }
 
-  if (d_seconds && when < d_cutOff) {
+  if (d_seconds > 0 && when < d_cutOff) {
     return false;
   }
 
@@ -872,7 +872,7 @@ bool DynBlockRulesGroup::DynBlockRule::rateExceeded(unsigned int count, const st
     return false;
   }
 
-  double delta = d_seconds ? d_seconds : DiffTime(now, d_minTime);
+  double delta = d_seconds > 0 ? d_seconds : DiffTime(now, d_minTime);
   double limit = delta * d_rate;
   return (count > limit);
 }
@@ -887,7 +887,7 @@ bool DynBlockRulesGroup::DynBlockRule::warningRateExceeded(unsigned int count, c
     return false;
   }
 
-  double delta = d_seconds ? d_seconds : DiffTime(now, d_minTime);
+  double delta = d_seconds > 0 ? d_seconds : DiffTime(now, d_minTime);
   double limit = delta * d_warningRate;
   return (count > limit);
 }
@@ -949,7 +949,7 @@ bool DynBlockRulesGroup::DynBlockCacheMissRatioRule::checkGlobalCacheHitRatio()
   if (globalMisses == 0 || globalHits == 0) {
     return false;
   }
-  double globalCacheHitRatio = static_cast<double>(globalHits) / (globalHits + globalMisses);
+  double globalCacheHitRatio = (globalHits * static_cast<double>(1.0)) / (globalHits + globalMisses);
   return globalCacheHitRatio >= d_minimumGlobalCacheHitRatio;
 }
 

diff --git a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
index df481eb09ad078e5f94fe6f46c89346467c40b40..fbd24dd973e92c33fb40259b646a9a32b7fbae27 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
+++ b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc
@@ -846,7 +846,9 @@ BOOST_FIXTURE_TEST_CASE(test_DynBlockRulesGroup_CacheMissRatio, TestFixture) {
   uint16_t size = 42;
   dnsdist::Protocol outgoingProtocol = dnsdist::Protocol::DoUDP;
   unsigned int responseTime = 100 * 1000; /* 100ms */
-  struct timespec now;
+  struct timespec now
+  {
+  };
   gettime(&now);
   NetmaskTree<DynBlock, AddressAndPortRange> emptyNMG;