clang-tidy: simplify some algorithms

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

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index f87fa39b1d23458862148a68c424f40da560605d..7eef549ded369fcfecc1555a7e8f3505e12f2bc5 100644 (file)
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -111,7 +111,7 @@ bool ArgvMap::contains(const string& var, const string& val)
   vector<string> parts;
 
   stringtok(parts, param->second, ", \t");
-  return std::any_of(parts.begin(), parts.end(), [&](const std::string& str) { return str == val; });
+  return std::find(parts.begin(), parts.end(), val) != parts.end();
 }
 
 string ArgvMap::helpstring(string prefix)

diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 49ad38ab49e464025df27190dc81505d6395d624..9c9abd063d3a9eaa5cf80d5a52aaa6f56b9bef0d 100644 (file)
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -317,8 +317,7 @@ try
     pos=split.second.find('/');
     if(pos != string::npos) // alexa has whole urls in the list now.
       split.second.resize(pos);
-    if(find_if(split.second.begin(), split.second.end(), isalpha) == split.second.end())
-    {
+    if (std::none_of(split.second.begin(), split.second.end(), isalpha)) {
       continue; // this was an IP address
     }
     domains.push_back(TypedQuery(split.second, qtype));

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 72311fd51ef89f6337fae81a4ea4d8a0398620c6..9cabe90ff2f1a4e083e11015b6e5ff77ede1af02 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -812,11 +812,7 @@ SvcParam SVCBBaseRecordContent::getParam(const SvcParam::SvcParamKey &key) const
 }
 
 set<SvcParam>::const_iterator SVCBBaseRecordContent::getParamIt(const SvcParam::SvcParamKey &key) const {
-  auto p = std::find_if(d_params.begin(), d_params.end(),
-      [&key](const SvcParam &param) {
-        return param.getKey() == key;
-      });
-  return p;
+  return std::find(d_params.begin(), d_params.end(), key);
 }
 
 std::shared_ptr<SVCBBaseRecordContent> SVCBRecordContent::clone() const

diff --git a/pdns/svc-records.hh b/pdns/svc-records.hh
index 19de2b9869e62e68710e601b1dde635f65dddb09..bd5530cef011bb5fb52f49abf67a9e71e762a650 100644 (file)
--- a/pdns/svc-records.hh
+++ b/pdns/svc-records.hh
@@ -76,6 +76,11 @@ class SvcParam {
 
   bool operator< (const SvcParam &other) const;
 
+  bool operator==(const SvcParamKey& key) const
+  {
+    return key == d_key;
+  }
+
   SvcParamKey getKey() const {
     return d_key;
   }