use min_element

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 2afde53a3596469a0b7c626fdf171ae5910a5ea8..832f89b269e308e67de77c4cd86dd1b2bd864ec6 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -244,12 +244,11 @@ bool DNSPacket::couldBeCached() const
 
 unsigned int DNSPacket::getMinTTL()
 {
-  unsigned int minttl = UINT_MAX;
-  for(const DNSZoneRecord& rr :  d_rrs) {
-    minttl = std::min(minttl, rr.dr.d_ttl);
+  auto it = std::min_element(d_rrs.begin(), d_rrs.end());
+  if (it != d_rrs.end()) {
+    return it->dr.d_ttl;
   }
-
-  return minttl;
+  return UINT_MAX;
 }
 
 bool DNSPacket::isEmpty()

diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index fd2f5b7112f3a7700375a276dae7dc9dd6fd6b26..cefeb792206c43f41adc0231dee7ae24d7597032 100644 (file)
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -438,6 +438,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