Fix clang-tidy warnings

diff --git a/pdns/axfr-retriever.cc b/pdns/axfr-retriever.cc
index 1c814f56d37c192ce395fb03b36337eccac864e2..4e93d3af2a191b2fa202154410c967331abfd59d 100644 (file)
--- a/pdns/axfr-retriever.cc
+++ b/pdns/axfr-retriever.cc
@@ -31,11 +31,11 @@ using pdns::resolver::parseResult;
 
 AXFRRetriever::AXFRRetriever(const ComboAddress& remote,
                              const DNSName& domain,
-                             const TSIGTriplet& tt,
+                             const TSIGTriplet& tsigConf,
                              const ComboAddress* laddr,
                              size_t maxReceivedBytes,
                              uint16_t timeout) :
-  d_buf(65536), d_tsigVerifier(tt, remote, d_trc), d_maxReceivedBytes(maxReceivedBytes)
+  d_buf(65536), d_tsigVerifier(tsigConf, remote, d_trc), d_maxReceivedBytes(maxReceivedBytes)
 {
   ComboAddress local;
   if (laddr != nullptr) {
@@ -59,17 +59,19 @@ AXFRRetriever::AXFRRetriever(const ComboAddress& remote,
     vector<uint8_t> packet;
     DNSPacketWriter pw(packet, domain, QType::AXFR);
     pw.getHeader()->id = dns_random_uint16();
-  
-    if(!tt.name.empty()) {
-      if (tt.algo == DNSName("hmac-md5"))
-        d_trc.d_algoName = tt.algo + DNSName("sig-alg.reg.int");
-      else
-        d_trc.d_algoName = tt.algo;
+
+    if (!tsigConf.name.empty()) {
+      if (tsigConf.algo == DNSName("hmac-md5")) {
+        d_trc.d_algoName = tsigConf.algo + DNSName("sig-alg.reg.int");
+      }
+      else {
+        d_trc.d_algoName = tsigConf.algo;
+      }
       d_trc.d_time = time(nullptr);
       d_trc.d_fudge = 300;
       d_trc.d_origID=ntohs(pw.getHeader()->id);
       d_trc.d_eRcode=0;
-      addTSIG(pw, d_trc, tt.name, tt.secret, "", false);
+      addTSIG(pw, d_trc, tsigConf.name, tsigConf.secret, "", false);
     }
   
     uint16_t replen=htons(packet.size());

diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh
index 14696df943f12150770b3e88944e1d4f6e1cfa06..37829e56c5b177a7d735c5d33d1f34709b4112f0 100644 (file)
--- a/pdns/dnswriter.hh
+++ b/pdns/dnswriter.hh
@@ -172,7 +172,7 @@ private:
   DNSName d_qname;
 
   uint16_t d_truncatemarker; // end of header, for truncate
-  DNSResourceRecord::Place d_recordplace;
+  DNSResourceRecord::Place d_recordplace{DNSResourceRecord::QUESTION};
   bool d_canonic{false}, d_lowerCase{false}, d_compress{false};
 };
 

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 20213ce5cb79cbae2c8fa745b6c2ec78edc6c9e1..fea0724d538270bc94d3e32eec6fda231c807713 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -587,7 +587,7 @@ WebServer::WebServer(string listenaddress, int port) :
   d_listenaddress(std::move(listenaddress)),
   d_port(port),
   d_server(nullptr),
-  d_maxbodysize(2 * 1024 * 1024)
+  d_maxbodysize(static_cast<ssize_t>(2 * 1024 * 1024))
 
 {
     YaHTTP::Router::Map("OPTIONS", "/<*url>", [](YaHTTP::Request *req, YaHTTP::Response *resp) {