From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 19 Jun 2025 07:56:07 +0000 (+0200)
Subject: dnsdist: Apply Otto's suggestions (thanks!)
X-Git-Tag: dnsdist-2.0.0-beta1~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15690%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Apply Otto's suggestions (thanks!)

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
---

diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc
index 83f1591ad4..27c17a9466 100644
--- a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc
@@ -31,7 +31,7 @@
 
 #include "protozero.hh"
 
-static void addMetaKeyAndValuesToProtobufContent(DNSQuestion& dnsQuestion, const std::string& key, const LuaArray<boost::variant<int64_t, std::string>>& values)
+static void addMetaKeyAndValuesToProtobufContent([[maybe_unused]] DNSQuestion& dnsQuestion, [[maybe_unused]] const std::string& key, [[maybe_unused]] const LuaArray<boost::variant<int64_t, std::string>>& values)
 {
 #if !defined(DISABLE_PROTOBUF)
   protozero::pbf_writer pbfWriter{dnsQuestion.d_rawProtobufContent};
diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
index 01838f1343..0ffa484e84 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
@@ -2279,7 +2279,7 @@ void dnsdist_ffi_svc_record_parameters_free(dnsdist_ffi_svc_record_parameters* p
 
 void dnsdist_ffi_dnsquestion_meta_begin_key([[maybe_unused]] dnsdist_ffi_dnsquestion_t* dnsQuestion, [[maybe_unused]] const char* key, [[maybe_unused]] size_t keyLen)
 {
-#ifndef DISABLE_PROTOBUF
+#if !defined(DISABLE_PROTOBUF)
   if (dnsQuestion == nullptr || key == nullptr || keyLen == 0) {
     return;
   }
@@ -2298,7 +2298,7 @@ void dnsdist_ffi_dnsquestion_meta_begin_key([[maybe_unused]] dnsdist_ffi_dnsques
 
 void dnsdist_ffi_dnsquestion_meta_add_str_value_to_key([[maybe_unused]] dnsdist_ffi_dnsquestion_t* dnsQuestion, [[maybe_unused]] const char* value, [[maybe_unused]] size_t valueLen)
 {
-#ifndef DISABLE_PROTOBUF
+#if !defined(DISABLE_PROTOBUF)
   if (dnsQuestion == nullptr || value == nullptr || valueLen == 0) {
     return;
   }
@@ -2314,7 +2314,7 @@ void dnsdist_ffi_dnsquestion_meta_add_str_value_to_key([[maybe_unused]] dnsdist_
 
 void dnsdist_ffi_dnsquestion_meta_add_int64_value_to_key([[maybe_unused]] dnsdist_ffi_dnsquestion_t* dnsQuestion, [[maybe_unused]] int64_t value)
 {
-#ifndef DISABLE_PROTOBUF
+#if !defined(DISABLE_PROTOBUF)
   if (dnsQuestion == nullptr) {
     return;
   }
@@ -2330,7 +2330,7 @@ void dnsdist_ffi_dnsquestion_meta_add_int64_value_to_key([[maybe_unused]] dnsdis
 
 void dnsdist_ffi_dnsquestion_meta_end_key([[maybe_unused]] dnsdist_ffi_dnsquestion_t* dnsQuestion)
 {
-#ifndef DISABLE_PROTOBUF
+#if !defined(DISABLE_PROTOBUF)
   if (dnsQuestion == nullptr) {
     return;
   }
diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.hh b/pdns/dnsdistdist/dnsdist-lua-ffi.hh
index b2c7110c15..3fc30f13e5 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi.hh
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi.hh
@@ -65,7 +65,7 @@ struct dnsdist_ffi_dnsquestion_t
   std::unique_ptr<std::vector<dnsdist_ffi_tag_t>> tagsVect;
   std::unique_ptr<std::vector<dnsdist_ffi_proxy_protocol_value_t>> proxyProtocolValuesVect;
   std::unique_ptr<std::unordered_map<std::string, std::string>> httpHeaders;
-#ifndef DISABLE_PROTOBUF
+#if !defined(DISABLE_PROTOBUF)
   protozero::pbf_writer pbfWriter;
   protozero::pbf_writer pbfMetaWriter;
   protozero::pbf_writer pbfMetaValueWriter;