Address clang-tidy concerns.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 440ddc13a614b370d5bd128291cc4f482f143713..cc1612b61f21c788e9f0461b279e42f20e32b059 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -124,7 +124,7 @@ bool PacketHandler::addCDNSKEY(DNSPacket& p, std::unique_ptr<DNSPacket>& r)
 {
   return addCDNSKEY(p, r, d_sd);
 }
-bool PacketHandler::addCDNSKEY(DNSPacket& p, std::unique_ptr<DNSPacket>& r, SOAData &sd)
+bool PacketHandler::addCDNSKEY(DNSPacket& p, std::unique_ptr<DNSPacket>& r, SOAData &sd) // NOLINT(readability-identifier-length)
 {
   string publishCDNSKEY;
   d_dk.getPublishCDNSKEY(sd.zonename,publishCDNSKEY);
@@ -755,7 +755,7 @@ void PacketHandler::emitNSEC(std::unique_ptr<DNSPacket>& r, const DNSName& name,
   r->addRecord(std::move(rr));
 }
 
-void PacketHandler::emitNSEC3(DNSPacket& p, std::unique_ptr<DNSPacket>& r, const NSEC3PARAMRecordContent& ns3prc, const DNSName& name, const string& namehash, const string& nexthash, int mode)
+void PacketHandler::emitNSEC3(DNSPacket& p, std::unique_ptr<DNSPacket>& r, const NSEC3PARAMRecordContent& ns3prc, const DNSName& name, const string& namehash, const string& nexthash, int mode) // NOLINT(readability-identifier-length)
 {
   NSEC3RecordContent n3rc;
   n3rc.d_algorithm = ns3prc.d_algorithm;
@@ -1340,7 +1340,8 @@ void PacketHandler::completeANYRecords(DNSPacket& p, std::unique_ptr<DNSPacket>&
   }
 }
 
-bool PacketHandler::tryAuthSignal(DNSPacket& p, std::unique_ptr<DNSPacket>& r, DNSName &target) {
+bool PacketHandler::tryAuthSignal(DNSPacket& p, std::unique_ptr<DNSPacket>& r, DNSName &target) // NOLINT(readability-identifier-length)
+{
   DLOG(g_log<<Logger::Warning<<"Let's try authenticated DNSSEC bootstrapping (RFC 9615) ..."<<endl);
   if(d_sd.zonename.operator const DNSName&().countLabels() == 0 || d_sd.zonename.operator const DNSName&().getRawLabel(0) != "_signal" || !d_dk.isSignalingZone(d_sd.zonename)) {
     return false;
@@ -1386,25 +1387,28 @@ bool PacketHandler::tryAuthSignal(DNSPacket& p, std::unique_ptr<DNSPacket>& r, D
   if(p.qtype.getCode() == QType::CDS) {
     d_dk.getPublishCDS(zone, val);
     autoPublish &= !val.empty();
-    if(autoPublish)
+    if(autoPublish) {
       haveOne = addCDS(p, r, zone_sd);
+    }
   } else if(p.qtype.getCode() == QType::CDNSKEY) {
     d_dk.getPublishCDNSKEY(zone, val);
     autoPublish &= !val.empty();
-    if(autoPublish)
+    if(autoPublish) {
       haveOne = addCDNSKEY(p, r, zone_sd);
+    }
   }
   if(!autoPublish) {
-      DNSZoneRecord rr;
+      DNSZoneRecord rec;
       B.lookup(p.qtype.getCode(), DNSName(zone), zone_sd.domain_id, &p);
-      while(B.get(rr)) {
-        rr.dr.d_name = p.qdomain;
-        r->addRecord(std::move(rr));
+      while(B.get(rec)) {
+        rec.dr.d_name = p.qdomain;
+        r->addRecord(std::move(rec));
         haveOne=true;
       }
     }
-  if(!haveOne)
+  if(!haveOne) {
     makeNOError(p, r, target, DNSName(), 6); // other type might exist
+  }
   return true;
 }
 

diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh
index 9d6551f06895954c4d3ffd439b5246f118af7cf0..230cf778d35bb0c1ee386f8225739fdd822a7d92 100644 (file)
--- a/pdns/packethandler.hh
+++ b/pdns/packethandler.hh
@@ -89,7 +89,7 @@ private:
   bool getNSEC3Hashes(bool narrow, const std::string& hashed, bool decrement, DNSName& unhashed, std::string& before, std::string& after, int mode=0);
   void addNSEC3(DNSPacket& p, std::unique_ptr<DNSPacket>& r, const DNSName &target, const DNSName &wildcard, const NSEC3PARAMRecordContent& nsec3param, bool narrow, int mode);
   void emitNSEC(std::unique_ptr<DNSPacket>& r, const DNSName& name, const DNSName& next, int mode);
-  void emitNSEC3(DNSPacket& p, std::unique_ptr<DNSPacket>& r, const NSEC3PARAMRecordContent &ns3rc, const DNSName& unhashed, const string& begin, const string& end, int mode);
+  void emitNSEC3(DNSPacket& p, std::unique_ptr<DNSPacket>& r, const NSEC3PARAMRecordContent &ns3prc, const DNSName& name, const string& namehash, const string& nexthash, int mode);
   int processUpdate(DNSPacket& p);
   int forwardPacket(const string &msgPrefix, const DNSPacket& p, const DomainInfo& di);
   uint performUpdate(const string &msgPrefix, const DNSRecord *rr, DomainInfo *di, bool isPresigned, bool* narrow, bool* haveNSEC3, NSEC3PARAMRecordContent *ns3pr, bool *updatedSerial);

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 336dca246234fc2f76aba58031ec15eeefcc6987..80d16a7a821da42c39227873e8fb63cb6a6f97c2 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -3717,7 +3717,7 @@ static int setSignalingZone(vector<string>& cmds, const std::string_view synopsi
   }
 
   // pdnsutil set-meta $zone SIGNALING-ZONE 1
-  if(addOrSetMeta(zone, "SIGNALING-ZONE", {"1"}, true)) {
+  if(addOrSetMeta(zone, "SIGNALING-ZONE", {"1"}, true) != 0) {
     cerr<<"Cannot set meta for zone " << zone << endl;
     return 1;
   }