From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 20 Jan 2023 15:32:08 +0000 (+0100)
Subject: dnsdist: Fix a couple warnings reported by clang++
X-Git-Tag: dnsdist-1.8.0-rc1~99^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12447%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix a couple warnings reported by clang++
---

diff --git a/pdns/cdb.cc b/pdns/cdb.cc
index 55ade934e5..ed8b8fda2e 100644
--- a/pdns/cdb.cc
+++ b/pdns/cdb.cc
@@ -145,9 +145,7 @@ vector<string> CDB::findall(string &key)
     throw std::runtime_error("Error looking up key '" + key + "' from CDB database: " + std::to_string(res));
   }
 
-  int x=0;
   while(cdb_findnext(&cdbf) > 0) {
-    x++;
     unsigned int vpos = cdb_datapos(&d_cdb);
     unsigned int vlen = cdb_datalen(&d_cdb);
     std::string val;
diff --git a/pdns/dnsdistdist/test-dnsdistrings_cc.cc b/pdns/dnsdistdist/test-dnsdistrings_cc.cc
index 8fa8dbf2e7..a642a951b5 100644
--- a/pdns/dnsdistdist/test-dnsdistrings_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistrings_cc.cc
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(test_Rings_Threaded) {
   Rings rings(numberOfEntries, numberOfShards, lockAttempts, true);
   rings.init();
 #if defined(DNSDIST_RINGS_WITH_MACADDRESS)
-  Rings::Query query({requestor, qname, now, dh, size, qtype, protocol, "", false});
+  Rings::Query query({requestor, qname, now, dh, size, qtype, protocol, dnsdist::MacAddress(), false});
 #else
   Rings::Query query({requestor, qname, now, dh, size, qtype, protocol});
 #endif