From c83b47feefae5f4988dd7b519bc89921e19bd26c Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 21 Aug 2024 15:37:04 +0200
Subject: [PATCH] dnsdist: Fix clang-tidy's warnings

---
 pdns/dnsdistdist/dnsdist-lua-ffi-interface.h |  6 +++---
 pdns/dnsdistdist/dnsdist-lua-ffi.cc          | 12 ++++++------
 pdns/dnsdistdist/test-dnsdist_cc.cc          |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi-interface.h b/pdns/dnsdistdist/dnsdist-lua-ffi-interface.h
index 9a1b7e4cb2..da6197891c 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi-interface.h
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi-interface.h
@@ -83,9 +83,9 @@ bool dnsdist_ffi_dnsquestion_get_ecs_override(const dnsdist_ffi_dnsquestion_t* d
 uint16_t dnsdist_ffi_dnsquestion_get_ecs_prefix_length(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
 bool dnsdist_ffi_dnsquestion_is_temp_failure_ttl_set(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
 uint32_t dnsdist_ffi_dnsquestion_get_temp_failure_ttl(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
-bool dnsdist_ffi_dnsquestion_get_do(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
-uint8_t dnsdist_ffi_dnsquestion_get_edns_version(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
-uint8_t dnsdist_ffi_dnsquestion_get_edns_extended_rcode(const dnsdist_ffi_dnsquestion_t* dq) __attribute__ ((visibility ("default")));
+bool dnsdist_ffi_dnsquestion_get_do(const dnsdist_ffi_dnsquestion_t* dnsQuestion) __attribute__ ((visibility ("default")));
+uint8_t dnsdist_ffi_dnsquestion_get_edns_version(const dnsdist_ffi_dnsquestion_t* dnsQuestion) __attribute__ ((visibility ("default")));
+uint8_t dnsdist_ffi_dnsquestion_get_edns_extended_rcode(const dnsdist_ffi_dnsquestion_t* dnsQuestion) __attribute__ ((visibility ("default")));
 void dnsdist_ffi_dnsquestion_get_sni(const dnsdist_ffi_dnsquestion_t* dq, const char** sni, size_t* sniSize) __attribute__ ((visibility ("default")));
 const char* dnsdist_ffi_dnsquestion_get_tag(const dnsdist_ffi_dnsquestion_t* dq, const char* label) __attribute__ ((visibility ("default")));
 size_t dnsdist_ffi_dnsquestion_get_tag_raw(const dnsdist_ffi_dnsquestion_t* dq, const char* label, char* buffer, size_t bufferSize) __attribute__ ((visibility ("default")));
diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
index 617fb9ce95..b54a069010 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
@@ -235,20 +235,20 @@ uint32_t dnsdist_ffi_dnsquestion_get_temp_failure_ttl(const dnsdist_ffi_dnsquest
   return 0;
 }
 
-bool dnsdist_ffi_dnsquestion_get_do(const dnsdist_ffi_dnsquestion_t* dq)
+bool dnsdist_ffi_dnsquestion_get_do(const dnsdist_ffi_dnsquestion_t* dnsQuestion)
 {
-  return dnsdist::getEDNSZ(*dq->dq) & EDNS_HEADER_FLAG_DO;
+  return (dnsdist::getEDNSZ(*dnsQuestion->dq) & EDNS_HEADER_FLAG_DO) != 0;
 }
 
-uint8_t dnsdist_ffi_dnsquestion_get_edns_version(const dnsdist_ffi_dnsquestion_t* dq)
+uint8_t dnsdist_ffi_dnsquestion_get_edns_version(const dnsdist_ffi_dnsquestion_t* dnsQuestion)
 {
-  auto version = dnsdist::getEDNSVersion(*dq->dq);
+  auto version = dnsdist::getEDNSVersion(*dnsQuestion->dq);
   return version ? *version : 0U;
 }
 
-uint8_t dnsdist_ffi_dnsquestion_get_edns_extended_rcode(const dnsdist_ffi_dnsquestion_t* dq)
+uint8_t dnsdist_ffi_dnsquestion_get_edns_extended_rcode(const dnsdist_ffi_dnsquestion_t* dnsQuestion)
 {
-  auto rcode = dnsdist::getEDNSExtendedRCode(*dq->dq);
+  auto rcode = dnsdist::getEDNSExtendedRCode(*dnsQuestion->dq);
   return rcode ? *rcode : 0U;
 }
 
diff --git a/pdns/dnsdistdist/test-dnsdist_cc.cc b/pdns/dnsdistdist/test-dnsdist_cc.cc
index 44a3cf75ee..1cca05f66c 100644
--- a/pdns/dnsdistdist/test-dnsdist_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdist_cc.cc
@@ -1600,7 +1600,7 @@ BOOST_AUTO_TEST_CASE(test_getEDNSVersion)
   const uint16_t qclass = QClass::IN;
   const GenericDNSPacketWriter<PacketBuffer>::optvect_t opts;
 
-  auto getVersion = [&qname, qtype, qclass](PacketBuffer& query) {
+  auto getVersion = [&qname](PacketBuffer& query) {
     InternalQueryState ids;
     ids.protocol = dnsdist::Protocol::DoUDP;
     ids.qname = qname;
@@ -1662,7 +1662,7 @@ BOOST_AUTO_TEST_CASE(test_getEDNSExtendedRCode)
   const uint16_t qtype = QType::A;
   const uint16_t qclass = QClass::IN;
 
-  auto getExtendedRCode = [&qname, qtype, qclass](PacketBuffer& query) {
+  auto getExtendedRCode = [&qname](PacketBuffer& query) {
     InternalQueryState ids;
     ids.protocol = dnsdist::Protocol::DoUDP;
     ids.qname = qname;
-- 
2.47.2