From: Remi Gacogne Date: Mon, 30 Dec 2024 15:39:36 +0000 (+0100) Subject: dnsdist: Fix clang-tidy warnings X-Git-Tag: dnsdist-2.0.0-alpha1~187^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44caebc5c74b745329d50a3cb2a96751d4286c11;p=thirdparty%2Fpdns.git dnsdist: Fix clang-tidy warnings --- diff --git a/pdns/dnsdistdist/dnsdist-doh-common.cc b/pdns/dnsdistdist/dnsdist-doh-common.cc index d6f48b9390..df3c01d8a2 100644 --- a/pdns/dnsdistdist/dnsdist-doh-common.cc +++ b/pdns/dnsdistdist/dnsdist-doh-common.cc @@ -69,7 +69,7 @@ bool HTTPPathRule::matches(const DNSQuestion* dq) const const auto path = dq->ids.du->getHTTPPath(); return d_path == path; } - else if (dq->ids.doh3u) { + if (dq->ids.doh3u) { return dq->ids.doh3u->getHTTPPath() == d_path; } return false; @@ -91,7 +91,7 @@ bool HTTPPathRegexRule::matches(const DNSQuestion* dq) const const auto path = dq->ids.du->getHTTPPath(); return d_regex.match(path); } - else if (dq->ids.doh3u) { + if (dq->ids.doh3u) { return d_regex.match(dq->ids.doh3u->getHTTPPath()); } return false; diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc index d531cb95dd..79ee928428 100644 --- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc +++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc @@ -422,10 +422,10 @@ size_t dnsdist_ffi_dnsquestion_get_http_headers(dnsdist_ffi_dnsquestion_t* dq, c { #if defined(HAVE_DNS_OVER_HTTPS) || defined(HAVE_DNS_OVER_HTTP3) const auto processHeaders = [&dq](const std::unordered_map& headers) { - if (headers.size() == 0) { + if (headers.empty()) { return; } - dq->httpHeaders = std::make_unique>(std::move(headers)); + dq->httpHeaders = std::make_unique>(headers); if (!dq->httpHeadersVect) { dq->httpHeadersVect = std::make_unique>(); } diff --git a/pdns/dnsdistdist/doh3.cc b/pdns/dnsdistdist/doh3.cc index e988805073..7f4586fe88 100644 --- a/pdns/dnsdistdist/doh3.cc +++ b/pdns/dnsdistdist/doh3.cc @@ -1049,7 +1049,7 @@ std::string DOH3Unit::getHTTPQueryString() const const auto& path = headers.at(":path"); auto pos = path.find('?'); if (pos == string::npos) { - return std::string(); + return {}; } return path.substr(pos); @@ -1082,22 +1082,22 @@ const dnsdist::doh3::h3_headers_t& DOH3Unit::getHTTPHeaders() const std::string DOH3Unit::getHTTPPath() const { - return std::string(); + return {}; } std::string DOH3Unit::getHTTPQueryString() const { - return std::string(); + return {}; } std::string DOH3Unit::getHTTPHost() const { - return std::string(); + return {}; } std::string DOH3Unit::getHTTPScheme() const { - return std::string(); + return {}; } const dnsdist::doh3::h3_headers_t& DOH3Unit::getHTTPHeaders() const