From: Rosen Penev Date: Mon, 9 Dec 2024 00:46:50 +0000 (-0800) Subject: clang-tidy: simplify some algorithms X-Git-Tag: dnsdist-2.0.0-alpha1~184^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34f7f05eebdc4eed7c907ffa0bd048cddc2b6286;p=thirdparty%2Fpdns.git clang-tidy: simplify some algorithms Signed-off-by: Rosen Penev --- diff --git a/pdns/arguments.cc b/pdns/arguments.cc index f87fa39b1d..7eef549ded 100644 --- a/pdns/arguments.cc +++ b/pdns/arguments.cc @@ -111,7 +111,7 @@ bool ArgvMap::contains(const string& var, const string& val) vector 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 49ad38ab49..9c9abd063d 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 72311fd51e..9cabe90ff2 100644 --- a/pdns/dnsrecords.cc +++ b/pdns/dnsrecords.cc @@ -812,11 +812,7 @@ SvcParam SVCBBaseRecordContent::getParam(const SvcParam::SvcParamKey &key) const } set::const_iterator SVCBBaseRecordContent::getParamIt(const SvcParam::SvcParamKey &key) const { - auto p = std::find_if(d_params.begin(), d_params.end(), - [&key](const SvcParam ¶m) { - return param.getKey() == key; - }); - return p; + return std::find(d_params.begin(), d_params.end(), key); } std::shared_ptr SVCBRecordContent::clone() const diff --git a/pdns/svc-records.hh b/pdns/svc-records.hh index 19de2b9869..bd5530cef0 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; }