From: Remi Gacogne Date: Fri, 7 Jun 2024 08:17:12 +0000 (+0200) Subject: dnsdist: Fix clang-tidy warnings X-Git-Tag: rec-5.2.0-alpha0~21^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2bf7c3e6096b523c139b7304a767d0594c930a;p=thirdparty%2Fpdns.git dnsdist: Fix clang-tidy warnings --- diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc index 1bbb9c2fdf..6af7562efb 100644 --- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc +++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc @@ -2165,15 +2165,18 @@ bool dnsdist_ffi_dnsquestion_generate_svc_response(dnsdist_ffi_dnsquestion_t* dn std::vector parameters; parameters.reserve(parametersListSize); for (size_t idx = 0; idx < parametersListSize; idx++) { - if (parametersList[idx] == nullptr) { + // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic): this is a C API + const auto& parameter = parametersList[idx]; + if (parameter == nullptr) { return false; } - parameters.push_back(parametersList[idx]->parameters); + parameters.push_back(parameter->parameters); } return dnsdist::svc::generateSVCResponse(*dnsQuestion->dq, ttl, parameters); } void dnsdist_ffi_svc_record_parameters_free(dnsdist_ffi_svc_record_parameters* parameters) { + // NOLINTNEXTLINE(cppcoreguidelines-owning-memory): this is a C API, RAII is not an option delete parameters; } diff --git a/pdns/dnsdistdist/dnsdist-svc.cc b/pdns/dnsdistdist/dnsdist-svc.cc index 6f73000ea8..5393f400d6 100644 --- a/pdns/dnsdistdist/dnsdist-svc.cc +++ b/pdns/dnsdistdist/dnsdist-svc.cc @@ -140,7 +140,7 @@ namespace dnsdist::svc bool generateSVCResponse(DNSQuestion& dnsQuestion, const std::vector>& svcRecordPayloads, const std::set>& additionals4, const std::set>& additionals6, const ResponseConfig& responseConfig) { /* it will likely be a bit bigger than that because of additionals */ - auto totalPayloadsSize = 0; + size_t totalPayloadsSize = 0; for (const auto& payload : svcRecordPayloads) { totalPayloadsSize += payload.size(); }