Merge pull request #14954 from neheb/mm

clang-tidy: use std::min/max
PowerDNS · Jan 20, 2025 · 97f9dfb · 97f9dfb
2 parents 0d38daa + 7f9a6a9
commit 97f9dfb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 #include "utility.hh"
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <sys/types.h>
@@ -243,13 +244,11 @@ bool DNSPacket::couldBeCached() const
 
 unsigned int DNSPacket::getMinTTL()
 {
-  unsigned int minttl = UINT_MAX;
-  for(const DNSZoneRecord& rr :  d_rrs) {
-  if (rr.dr.d_ttl < minttl)
-      minttl = rr.dr.d_ttl;
+  auto iter = std::min_element(d_rrs.begin(), d_rrs.end());
+  if (iter != d_rrs.end()) {
+    return iter->dr.d_ttl;
   }
-
-  return minttl;
+  return UINT_MAX;
 }
 
 bool DNSPacket::isEmpty()

diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
@@ -1016,9 +1016,7 @@ uint32_t getDNSPacketMinTTL(const char* packet, size_t length, bool* seenAuthSOA
       }
 
       const uint32_t ttl = dpm.get32BitInt();
-      if (result > ttl) {
-        result = ttl;
-      }
+      result = std::min(result, ttl);
 
       dpm.skipRData();
     }

diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
@@ -451,6 +451,10 @@ struct DNSZoneRecord
   bool auth{true};
   bool disabled{false};
   DNSRecord dr;
+
+  bool operator<(const DNSZoneRecord& other) const {
+    return dr.d_ttl < other.dr.d_ttl;
+  }
 };
 
 class UnknownRecordContent : public DNSRecordContent

diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc
@@ -1181,18 +1181,14 @@ static void setupLuaRecords(LuaContext& lua) // NOLINT(readability-function-cogn
    * @example ifportup(443, { '1.2.3.4', '5.4.3.2' })"
    */
   lua.writeFunction("ifportup", [](int port, const boost::variant<iplist_t, ipunitlist_t>& ips, const boost::optional<std::unordered_map<string,string>> options) {
-      if (port < 0) {
-        port = 0;
-      }
-      if (port > std::numeric_limits<uint16_t>::max()) {
-        port = std::numeric_limits<uint16_t>::max();
-      }
+    port = std::max(port, 0);
+    port = std::min(port, static_cast<int>(std::numeric_limits<uint16_t>::max()));
 
-      auto checker = [](const ComboAddress& addr, const opts_t& opts) {
-        return g_up.isUp(addr, opts);
-      };
-      return genericIfUp(ips, options, checker, port);
-    });
+    auto checker = [](const ComboAddress& addr, const opts_t& opts) {
+      return g_up.isUp(addr, opts);
+    };
+    return genericIfUp(ips, options, checker, port);
+  });
 
   lua.writeFunction("ifurlextup", [](const vector<pair<int, opts_t> >& ipurls, boost::optional<opts_t> options) {
       vector<ComboAddress> candidates;

diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 
+#include <algorithm>
 #include <boost/format.hpp>
 
 #include "utility.hh"
@@ -46,8 +47,7 @@ static uint8_t precsize_aton(const char **strptr)
       break;
 
   mantissa = cmval / poweroften[exponent];
-  if (mantissa > 9)
-    mantissa = 9;
+  mantissa = std::min(mantissa, 9);
 
   retval = (mantissa << 4) | exponent;