From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 15 Apr 2025 08:56:09 +0000 (+0200)
Subject: dnsdist: Fix clang-tidy warnings
X-Git-Tag: dnsdist-2.0.0-alpha2~44^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15431%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix clang-tidy warnings
---

diff --git a/pdns/dnsdistdist/dnsdist-backend.cc b/pdns/dnsdistdist/dnsdist-backend.cc
index 607c709c35..7fdd7faa21 100644
--- a/pdns/dnsdistdist/dnsdist-backend.cc
+++ b/pdns/dnsdistdist/dnsdist-backend.cc
@@ -727,7 +727,7 @@ bool DownstreamState::healthCheckRequired(std::optional<time_t> currentTime)
 
     return false;
   }
-  else if (d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active) {
+  if (d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active) {
 
     if (d_nextCheck > 1) {
       --d_nextCheck;
@@ -985,7 +985,7 @@ bool DownstreamState::parseSourceParameter(const std::string& source, Downstream
   return false;
 }
 
-bool DownstreamState::parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string str)
+bool DownstreamState::parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string& str)
 {
   if (pdns_iequals(str, "auto")) {
     config.d_availability = DownstreamState::Availability::Auto;
diff --git a/pdns/dnsdistdist/dnsdist.hh b/pdns/dnsdistdist/dnsdist.hh
index 3c3c135659..7a9f5f2e84 100644
--- a/pdns/dnsdistdist/dnsdist.hh
+++ b/pdns/dnsdistdist/dnsdist.hh
@@ -731,7 +731,7 @@ private:
 
 public:
   static bool parseSourceParameter(const std::string& source, Config& config);
-  static bool parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string str);
+  static bool parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string& str);
 
   void updateStatisticsInfo()
   {
diff --git a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
index 3b93b9cf7a..3948bc5892 100644
--- a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
@@ -305,22 +305,22 @@ BOOST_AUTO_TEST_CASE(test_CheckAutoRestorePreviousHealthCheckMode)
   /* prevents a re-connection */
   config.remote = ComboAddress("0.0.0.0");
 
-  DownstreamState ds(std::move(config), nullptr, false);
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
-  ds.setUp();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Up);
-  ds.setAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
-  ds.setActiveAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
-  ds.setUp();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Up);
-  ds.setAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
+  DownstreamState downstream(std::move(config), nullptr, false);
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
+  downstream.setUp();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Up);
+  downstream.setAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
+  downstream.setActiveAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
+  downstream.setUp();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Up);
+  downstream.setAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
 }
 
 BOOST_AUTO_TEST_SUITE_END()