Assorted delinting, mark do while loops as ok

diff --git a/.clang-tidy.full b/.clang-tidy.full
index f6ba38ee2e97f29339f9ddc5931219ef9d0e4da1..2b208a6996e64a3e5ec7fefd300b581f1f1eb433 100644 (file)
--- a/.clang-tidy.full
+++ b/.clang-tidy.full
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,bugprone-*,concurrency-*,modernize-*,performance-*,portability-*,readability-*,-modernize-use-trailing-return-type,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-pro-type-vararg'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,bugprone-*,concurrency-*,modernize-*,performance-*,portability-*,readability-*,-modernize-use-trailing-return-type,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-avoid-do-while'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

diff --git a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
index cc29a195d5430acaf71f37b567f141455327949d..52f8076c30f459ae99412034c3fc5c7a488b4fd5 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
+++ b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc
@@ -451,7 +451,7 @@ BOOST_AUTO_TEST_CASE(test_Overlay)
 
       BOOST_CHECK_EQUAL(record.d_name, target);
       BOOST_CHECK_EQUAL(record.d_class, QClass::IN);
-      BOOST_CHECK_EQUAL(record.d_ttl, 7200);
+      BOOST_CHECK_EQUAL(record.d_ttl, 7200U);
       BOOST_CHECK_EQUAL(record.d_place, 1U);
       BOOST_CHECK_GE(record.d_contentOffset, lastOffset);
       lastOffset = record.d_contentOffset + record.d_contentLength;

diff --git a/pdns/recursordist/pdns_recursor.cc b/pdns/recursordist/pdns_recursor.cc
index 6ecbce1b78ecb0c096c236710975434fb41870dc..87f87531447214a5a1401d14307502a51ffd722f 100644 (file)
--- a/pdns/recursordist/pdns_recursor.cc
+++ b/pdns/recursordist/pdns_recursor.cc
@@ -2365,7 +2365,6 @@ static string* doProcessUDPQuestion(const std::string& question, const ComboAddr
 
 static void handleNewUDPQuestion(int fileDesc, FDMultiplexer::funcparam_t& /* var */) // NOLINT(readability-function-cognitive-complexity): https://github.com/PowerDNS/pdns/issues/12791
 {
-  ssize_t len = 0;
   static const size_t maxIncomingQuerySize = g_proxyProtocolACL.empty() ? 512 : (512 + g_proxyProtocolMaximumSize);
   static thread_local std::string data;
   ComboAddress fromaddr; // the address the query is coming from
@@ -2389,7 +2388,7 @@ static void handleNewUDPQuestion(int fileDesc, FDMultiplexer::funcparam_t& /* va
     fromaddr.sin6.sin6_family = AF_INET6; // this makes sure fromaddr is big enough
     fillMSGHdr(&msgh, &iov, &cbuf, sizeof(cbuf), data.data(), data.size(), &fromaddr);
 
-    if ((len = recvmsg(fileDesc, &msgh, 0)) >= 0) {
+    if (ssize_t len = recvmsg(fileDesc, &msgh, 0); len >= 0) {
       eventTrace.clear();
       eventTrace.setEnabled(SyncRes::s_event_trace_enabled != 0);
       eventTrace.add(RecEventTrace::ReqRecv);

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index dc0d3345ab6ba4f35075440b451061ca82f913c0..0db32d67c5d2611056d14c76e4ddec83099a6942 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2354,7 +2354,7 @@ private:
     0, 0
   };
   struct timeval period;
-  const string name;
+  string name;
 };
 
 static void houseKeepingWork(Logr::log_t log)

diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc
index 5b603c4da4dbc10232232fb3e6442183a5011ffe..8e09f19cbfd9447df86e19bedbeaf6d521aefaa5 100644 (file)
--- a/pdns/recursordist/reczones.cc
+++ b/pdns/recursordist/reczones.cc
@@ -62,16 +62,16 @@ bool primeHints(time_t now)
   return ret;
 }
 
-static void convertServersForAD(const std::string& zone, const std::string& input, SyncRes::AuthDomain& ad, const char* sepa, Logr::log_t log, bool verbose = true)
+static void convertServersForAD(const std::string& zone, const std::string& input, SyncRes::AuthDomain& authDomain, const char* sepa, Logr::log_t log, bool verbose = true)
 {
   vector<string> servers;
   stringtok(servers, input, sepa);
-  ad.d_servers.clear();
+  authDomain.d_servers.clear();
 
   vector<string> addresses;
-  for (auto server = servers.begin(); server != servers.end(); ++server) {
-    ComboAddress addr = parseIPAndPort(*server, 53);
-    ad.d_servers.push_back(addr);
+  for (auto& server : servers) {
+    ComboAddress addr = parseIPAndPort(server, 53);
+    authDomain.d_servers.push_back(addr);
     if (verbose) {
       addresses.push_back(addr.toStringWithPort());
     }
@@ -79,24 +79,24 @@ static void convertServersForAD(const std::string& zone, const std::string& inpu
   if (verbose) {
     if (!g_slogStructured) {
       g_log << Logger::Info << "Redirecting queries for zone '" << zone << "' ";
-      if (ad.d_rdForward) {
+      if (authDomain.d_rdForward) {
         g_log << "with recursion ";
       }
       g_log << "to: ";
       bool first = true;
-      for (const auto& a : addresses) {
+      for (const auto& address : addresses) {
         if (!first) {
           g_log << ", ";
         }
         else {
           first = false;
         }
-        g_log << a;
+        g_log << address;
       }
       g_log << endl;
     }
     else {
-      log->info(Logr::Info, "Redirecting queries", "zone", Logging::Loggable(zone), "recursion", Logging::Loggable(ad.d_rdForward), "addresses", Logging::IterLoggable(addresses.begin(), addresses.end()));
+      log->info(Logr::Info, "Redirecting queries", "zone", Logging::Loggable(zone), "recursion", Logging::Loggable(authDomain.d_rdForward), "addresses", Logging::IterLoggable(addresses.begin(), addresses.end()));
     }
   }
 }
@@ -104,7 +104,7 @@ static void convertServersForAD(const std::string& zone, const std::string& inpu
 static void* pleaseUseNewSDomainsMap(std::shared_ptr<SyncRes::domainmap_t> newmap)
 {
   SyncRes::setDomainMap(std::move(newmap));
-  return 0;
+  return nullptr;
 }
 
 string reloadZoneConfiguration(bool yaml)

diff --git a/pdns/recursordist/secpoll-recursor.cc b/pdns/recursordist/secpoll-recursor.cc
index 9b8761d4ab91fabbeef9f23503d40b1ef7430b9e..9c165cb82179ba16d0674cc6a88b194915b79310 100644 (file)
--- a/pdns/recursordist/secpoll-recursor.cc
+++ b/pdns/recursordist/secpoll-recursor.cc
@@ -9,7 +9,7 @@
 #include "validate-recursor.hh"
 #include "secpoll.hh"
 
-#include <stdint.h>
+#include <cstdint>
 #ifndef PACKAGEVERSION
 #define PACKAGEVERSION getPDNSVersion()
 #endif
@@ -19,49 +19,54 @@ string g_security_message;
 
 void doSecPoll(time_t* last_secpoll, Logr::log_t log)
 {
-  if (::arg()["security-poll-suffix"].empty())
+  if (::arg()["security-poll-suffix"].empty()) {
     return;
+  }
 
   string pkgv(PACKAGEVERSION);
-  struct timeval now;
-  gettimeofday(&now, 0);
+  struct timeval now
+  {
+  };
+  Utility::gettimeofday(&now);
 
   /* update last_secpoll right now, even if it fails
      we don't want to retry right away and hammer the server */
   *last_secpoll = now.tv_sec;
 
-  SyncRes sr(now);
+  SyncRes resolver(now);
   if (g_dnssecmode != DNSSECMode::Off) {
-    sr.setDoDNSSEC(true);
-    sr.setDNSSECValidationRequested(true);
+    resolver.setDoDNSSEC(true);
+    resolver.setDNSSECValidationRequested(true);
   }
-  sr.setId("SecPoll");
+  resolver.setId("SecPoll");
 
   vector<DNSRecord> ret;
 
   string version = "recursor-" + pkgv;
   string qstring(version.substr(0, 63) + ".security-status." + ::arg()["security-poll-suffix"]);
 
-  if (*qstring.rbegin() != '.')
+  if (*qstring.rbegin() != '.') {
     qstring += '.';
+  }
 
   boost::replace_all(qstring, "+", "_");
   boost::replace_all(qstring, "~", "_");
 
   vState state = vState::Indeterminate;
   DNSName query(qstring);
-  int res = sr.beginResolve(query, QType(QType::TXT), 1, ret);
+  int res = resolver.beginResolve(query, QType(QType::TXT), 1, ret);
 
-  if (g_dnssecmode != DNSSECMode::Off && res) {
-    state = sr.getValidationState();
+  if (g_dnssecmode != DNSSECMode::Off && res != 0) {
+    state = resolver.getValidationState();
   }
 
   auto vlog = log->withValues("version", Logging::Loggable(pkgv), "query", Logging::Loggable(query));
   if (vStateIsBogus(state)) {
     SLOG(g_log << Logger::Error << "Failed to retrieve security status update for '" + pkgv + "' on '" << query << "', DNSSEC validation result was Bogus!" << endl,
          vlog->info(Logr::Error, "Failed to retrieve security status update", "validationResult", Logging::Loggable(vStateToString(state))));
-    if (g_security_status == 1) // If we were OK, go to unknown
+    if (g_security_status == 1) { // If we were OK, go to unknown
       g_security_status = 0;
+    }
     return;
   }
 
@@ -72,7 +77,7 @@ void doSecPoll(time_t* last_secpoll, Logr::log_t log)
   }
 
   string security_message;
-  int security_status = g_security_status;
+  int security_status = static_cast<int>(g_security_status);
 
   try {
     processSecPoll(res, ret, security_status, security_message);