From 34f7f05eebdc4eed7c907ffa0bd048cddc2b6286 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 8 Dec 2024 16:46:50 -0800
Subject: [PATCH] clang-tidy: simplify some algorithms

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 pdns/arguments.cc   | 2 +-
 pdns/dnsbulktest.cc | 3 +--
 pdns/dnsrecords.cc  | 6 +-----
 pdns/svc-records.hh | 5 +++++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index f87fa39b1d23..7eef549ded36 100644
--- 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 49ad38ab49e4..9c9abd063d3a 100644
--- 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 72311fd51ef8..9cabe90ff2f1 100644
--- 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 19de2b9869e6..bd5530cef011 100644
--- 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;
   }