rec: Fix shadowed variables

No real issue here, but I'd like to be able `-Wshadow` to prevent
future mishaps at some point.

(cherry picked from commit dd07976412d9b2b35db7179ceb590e542aff9eef)

diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index 9ae0492e8ca7693afd6aaa4c5b4505fd2e5f8db9..0000852fe35395539ac40c58f57743fe01f62e27 100644 (file)
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -425,7 +425,7 @@ extern BackendMakerClass &BackendMakers();
 class DBException : public PDNSException
 {
 public:
-  DBException(const string &reason) : PDNSException(reason){}
+  DBException(const string &reason_) : PDNSException(reason_){}
 };
 
 /** helper function for both DNSPacket and addSOARecord() - converts a line into a struct, for easier parsing */

diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index e9adc82fb63dc2c7eada67794b73970919a677e7..98019627613a50a561d295ae3181ca295f3c2e48 100644 (file)
--- a/pdns/dnsname.hh
+++ b/pdns/dnsname.hh
@@ -229,15 +229,15 @@ inline DNSName operator+(const DNSName& lhs, const DNSName& rhs)
    anything part of that domain will return 'true' in check */
 struct SuffixMatchNode
 {
-  SuffixMatchNode(const std::string& name_="", bool endNode_=false) : name(name_), endNode(endNode_)
+  SuffixMatchNode(const std::string& name_="", bool endNode_=false) : d_name(name_), endNode(endNode_)
   {}
-  std::string name;
+  std::string d_name;
   std::string d_human;
   mutable std::set<SuffixMatchNode> children;
   mutable bool endNode;
   bool operator<(const SuffixMatchNode& rhs) const
   {
-    return strcasecmp(name.c_str(), rhs.name.c_str()) < 0;
+    return strcasecmp(d_name.c_str(), rhs.d_name.c_str()) < 0;
   }
 
   void add(const DNSName& name) 

diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc
index ea0cde2bf3bfd93b86dbd3a9f56a7780a26d3955..4a9cbde071ad4d32d4745a39dd15218e2df39195 100644 (file)
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@ -302,8 +302,8 @@ RecursorLua4::RecursorLua4(const std::string& fname)
           cas.insert(ComboAddress(*s));
         }
         else if(auto v = boost::get<vector<pair<unsigned int, string> > >(&in)) {
-          for(const auto& s : *v)
-            cas.insert(ComboAddress(s.second));
+          for(const auto&entry : *v)
+            cas.insert(ComboAddress(entry.second));
           }
         else {
           cas.insert(boost::get<ComboAddress>(in));
@@ -408,8 +408,8 @@ RecursorLua4::RecursorLua4(const std::string& fname)
 
       if(auto rec = std::dynamic_pointer_cast<ARecordContent>(dr.d_content))
         ret=rec->getCA(53);
-      else if(auto rec = std::dynamic_pointer_cast<AAAARecordContent>(dr.d_content))
-        ret=rec->getCA(53);
+      else if(auto aaaarec = std::dynamic_pointer_cast<AAAARecordContent>(dr.d_content))
+        ret=aaaarec->getCA(53);
       return ret;
     });
 
@@ -455,8 +455,8 @@ RecursorLua4::RecursorLua4(const std::string& fname)
           smn.add(DNSName(*s));
         }
         else if(auto v = boost::get<vector<pair<unsigned int, string> > >(&in)) {
-          for(const auto& s : *v)
-            smn.add(DNSName(s.second));
+          for(const auto& entry : *v)
+            smn.add(DNSName(entry.second));
         }
         else {
           smn.add(boost::get<DNSName>(in));
@@ -648,14 +648,14 @@ loop:;
       }
       else if(dq->followupFunction=="udpQueryResponse") {
         dq->udpAnswer = GenUDPQueryResponse(dq->udpQueryDest, dq->udpQuery);
-        auto func = d_lw->readVariable<boost::optional<luacall_t>>(dq->udpCallback).get_value_or(0);
-        if(!func) {
+        auto cbFunc = d_lw->readVariable<boost::optional<luacall_t>>(dq->udpCallback).get_value_or(0);
+        if(!cbFunc) {
           theL()<<Logger::Error<<"Attempted callback for Lua UDP Query/Response which could not be found"<<endl;
           return false;
         }
-        bool res=func(dq);
+        bool result=cbFunc(dq);
         if(variable) *variable |= dq->variable; // could still be set to indicate this *name* is variable
-        if(!res) {
+        if(!result) {
           return false;
         }
         goto loop;

diff --git a/pdns/lwres.hh b/pdns/lwres.hh
index 1762ed98a9bfa30e754f554dc9f05d53e4611785..e04e67f201dcbd4340146d0e2715b1b493eca24c 100644 (file)
--- a/pdns/lwres.hh
+++ b/pdns/lwres.hh
@@ -51,7 +51,7 @@ int arecvfrom(char *data, size_t len, int flags, const ComboAddress& ip, size_t
 class LWResException : public PDNSException
 {
 public:
-  LWResException(const string &reason) : PDNSException(reason){}
+  LWResException(const string &reason_) : PDNSException(reason_){}
 };
 
 //! LWRes class 

diff --git a/pdns/nsecrecords.cc b/pdns/nsecrecords.cc
index 4796f4d40cf98255ac85fb3d7aeed03a4786caec..dc239509da004a36ca53dad0bc73bf21859e7e60 100644 (file)
--- a/pdns/nsecrecords.cc
+++ b/pdns/nsecrecords.cc
@@ -97,17 +97,17 @@ NSECRecordContent::DNSRecordContent* NSECRecordContent::make(const DNSRecord &dr
   
   for(unsigned int n = 0; n+1 < bitmap.size();) {
     unsigned int window=static_cast<unsigned char>(bitmap[n++]);
-    unsigned int len=static_cast<unsigned char>(bitmap[n++]);
+    unsigned int blen=static_cast<unsigned char>(bitmap[n++]);
 
     // end if zero padding and ensure packet length
-    if(window == 0&&len == 0) break;
-    if(n+len>bitmap.size()) 
+    if(window == 0 && blen == 0) break;
+    if(n + blen > bitmap.size())
       throw MOADNSException("NSEC record with bitmap length > packet length");
 
-    for(unsigned int k=0; k < len; k++) {
+    for(unsigned int k=0; k < blen; k++) {
       uint8_t val=bitmap[n++];
-      for(int bit = 0; bit < 8 ; ++bit , val>>=1) 
-        if(val & 1) { 
+      for(int bit = 0; bit < 8 ; ++bit , val>>=1)
+        if(val & 1) {
           ret->d_set.insert((7-bit) + 8*(k) + 256*window);
         }
       }

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 9b2acc8b8a2d3fbee48538d7e0ee967b8883a34a..bf2f1522b25f35c36571d872636cb600d4c8e62d 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1133,15 +1133,15 @@ void startDoResolve(void *p)
       iov[0].iov_base=(void*)buf;              iov[0].iov_len=2;
       iov[1].iov_base=(void*)&*packet.begin(); iov[1].iov_len = packet.size();
 
-      int ret=Utility::writev(dc->d_socket, iov, 2);
+      int wret=Utility::writev(dc->d_socket, iov, 2);
       bool hadError=true;
 
-      if(ret == 0)
+      if(wret == 0)
         L<<Logger::Error<<"EOF writing TCP answer to "<<dc->getRemote()<<endl;
-      else if(ret < 0 )
+      else if(wret < 0 )
         L<<Logger::Error<<"Error writing TCP answer to "<<dc->getRemote()<<": "<< strerror(errno) <<endl;
-      else if((unsigned int)ret != 2 + packet.size())
-        L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" for "<<dc->d_mdp.d_qname<<" (size="<< (2 + packet.size()) <<", sent "<<ret<<")"<<endl;
+      else if((unsigned int)wret != 2 + packet.size())
+        L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" for "<<dc->d_mdp.d_qname<<" (size="<< (2 + packet.size()) <<", sent "<<wret<<")"<<endl;
       else
         hadError=false;
 
@@ -1548,9 +1548,9 @@ string* doProcessUDPQuestion(const std::string& question, const ComboAddress& fr
         L<<Logger::Warning<<"Sending UDP reply to client "<<fromaddr.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl;
 
       if(response.length() >= sizeof(struct dnsheader)) {
-        struct dnsheader dh;
-        memcpy(&dh, response.c_str(), sizeof(dh));
-        updateResponseStats(dh.rcode, fromaddr, response.length(), 0, 0);
+        struct dnsheader tmpdh;
+        memcpy(&tmpdh, response.c_str(), sizeof(tmpdh));
+        updateResponseStats(tmpdh.rcode, fromaddr, response.length(), 0, 0);
       }
       g_stats.avgLatencyUsec=(1-1.0/g_latencyStatSize)*g_stats.avgLatencyUsec + 0.0; // we assume 0 usec
       return 0;
@@ -1825,7 +1825,6 @@ void makeUDPServerSockets()
   
 #ifdef SO_REUSEPORT  
     if(::arg().mustDo("reuseport")) {
-      int one=1;
       if(setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)) < 0)
         throw PDNSException("SO_REUSEPORT: "+stringerror());
     }

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 2347b18c217ef6f68e935dcc136935bcb1d0e69c..3f1ad6616da3e5f70c4b9b478f7f157a1ed50fac 100644 (file)
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -88,7 +88,7 @@ void loadRecursorLuaConfig(const std::string& fname, bool checkOnly)
   };
   Lua.writeVariable("Policy", pmap);
 
-  Lua.writeFunction("rpzFile", [&lci](const string& fname, const boost::optional<std::unordered_map<string,boost::variant<int, string>>>& options) {
+  Lua.writeFunction("rpzFile", [&lci](const string& filename, const boost::optional<std::unordered_map<string,boost::variant<int, string>>>& options) {
       try {
        boost::optional<DNSFilterEngine::Policy> defpol;
        std::string polName("rpzFile");
@@ -117,13 +117,13 @@ void loadRecursorLuaConfig(const std::string& fname, bool checkOnly)
          }
        }
         const size_t zoneIdx = lci.dfe.size();
-        theL()<<Logger::Warning<<"Loading RPZ from file '"<<fname<<"'"<<endl;
+        theL()<<Logger::Warning<<"Loading RPZ from file '"<<filename<<"'"<<endl;
         lci.dfe.setPolicyName(zoneIdx, polName);
-        loadRPZFromFile(fname, lci.dfe, defpol, zoneIdx);
-        theL()<<Logger::Warning<<"Done loading RPZ from file '"<<fname<<"'"<<endl;
+        loadRPZFromFile(filename, lci.dfe, defpol, zoneIdx);
+        theL()<<Logger::Warning<<"Done loading RPZ from file '"<<filename<<"'"<<endl;
       }
       catch(std::exception& e) {
-       theL()<<Logger::Error<<"Unable to load RPZ zone from '"<<fname<<"': "<<e.what()<<endl;
+       theL()<<Logger::Error<<"Unable to load RPZ zone from '"<<filename<<"': "<<e.what()<<endl;
       }
     });
 
@@ -221,8 +221,8 @@ void loadRecursorLuaConfig(const std::string& fname, bool checkOnly)
                            }
                            else {
                              const auto& v =boost::get<vector<pair<int, string> > >(e.second);
-                             for(const auto& e : v)
-                               lci.sortlist.addEntry(formask, Netmask(e.second), order);
+                             for(const auto& entry : v)
+                               lci.sortlist.addEntry(formask, Netmask(entry.second), order);
                            }
                            ++order;
                          }
@@ -317,13 +317,13 @@ void loadRecursorLuaConfig(const std::string& fname, bool checkOnly)
     theL()<<Logger::Error<<"Unable to load Lua script from '"+fname+"': ";
     try {
       std::rethrow_if_nested(e);
-    } catch(const std::exception& e) {
-      // e is the exception that was thrown from inside the lambda
-      theL() << e.what() << std::endl;      
+    } catch(const std::exception& exp) {
+      // exp is the exception that was thrown from inside the lambda
+      theL() << exp.what() << std::endl;
     }
-    catch(const PDNSException& e) {
-      // e is the exception that was thrown from inside the lambda
-      theL() << e.reason << std::endl;      
+    catch(const PDNSException& exp) {
+      // exp is the exception that was thrown from inside the lambda
+      theL() << exp.reason << std::endl;
     }
     throw;
 

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 3245d891e44a1b84231365cea39880a3142353e9..b6315263ba3ad3b0e56e7d17e507f9b9d3529faf 100644 (file)
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -439,17 +439,17 @@ string doClearNTA(T begin, T end)
 
   string removed("");
   bool first(true);
-  for (auto const &who : toRemove) {
-    L<<Logger::Warning<<"Clearing Negative Trust Anchor for "<<who<<", requested via control channel"<<endl;
-    g_luaconfs.modify([who](LuaConfigItems& lci) {
-        lci.negAnchors.erase(who);
+  for (auto const &entry : toRemove) {
+    L<<Logger::Warning<<"Clearing Negative Trust Anchor for "<<entry<<", requested via control channel"<<endl;
+    g_luaconfs.modify([entry](LuaConfigItems& lci) {
+        lci.negAnchors.erase(entry);
       });
-    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, who, true));
+    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, entry, true));
     if (!first) {
       first = false;
       removed += ",";
     }
-    removed += " " + who.toStringRootDot();
+    removed += " " + entry.toStringRootDot();
   }
   return "Removed Negative Trust Anchors for " + removed + "\n";
 }
@@ -529,17 +529,17 @@ string doClearTA(T begin, T end)
 
   string removed("");
   bool first(true);
-  for (auto const &who : toRemove) {
-    L<<Logger::Warning<<"Removing Trust Anchor for "<<who<<", requested via control channel"<<endl;
-    g_luaconfs.modify([who](LuaConfigItems& lci) {
-        lci.dsAnchors.erase(who);
+  for (auto const &entry : toRemove) {
+    L<<Logger::Warning<<"Removing Trust Anchor for "<<entry<<", requested via control channel"<<endl;
+    g_luaconfs.modify([entry](LuaConfigItems& lci) {
+        lci.dsAnchors.erase(entry);
       });
-    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, who, true));
+    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, entry, true));
     if (!first) {
       first = false;
       removed += ",";
     }
-    removed += " " + who.toStringRootDot();
+    removed += " " + entry.toStringRootDot();
   }
   return "Removed Trust Anchor(s) for" + removed + "\n";
 }

diff --git a/pdns/resolver.hh b/pdns/resolver.hh
index 548551a0a3b5a17b16aa3f99d9b8e83ab14ba94f..fcfa031e8b34cb7b684283a90d88b62c0f0c44c1 100644 (file)
--- a/pdns/resolver.hh
+++ b/pdns/resolver.hh
@@ -46,7 +46,7 @@
 class ResolverException : public PDNSException
 {
 public:
-  ResolverException(const string &reason) : PDNSException(reason){}
+  ResolverException(const string &reason_) : PDNSException(reason_){}
 };
 
 // make an IPv4 or IPv6 query socket 

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 1d2624d9eecf5be18e7ceadd23d05dc0d1dc7aea..bfee4685e09960001892a64599cee89a4c338584 100644 (file)
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -75,33 +75,33 @@ void RPZRecordToPolicy(const DNSRecord& dr, DNSFilterEngine& target, bool addOrR
     if (!crc) {
       return;
     }
-    auto target=crc->getTarget();
+    auto crcTarget=crc->getTarget();
     if(defpol) {
       pol=*defpol;
     }
-    else if(target.isRoot()) {
+    else if(crcTarget.isRoot()) {
       // cerr<<"Wants NXDOMAIN for "<<dr.d_name<<": ";
       pol.d_kind = DNSFilterEngine::PolicyKind::NXDOMAIN;
-    } else if(target==DNSName("*")) {
+    } else if(crcTarget==DNSName("*")) {
       // cerr<<"Wants NODATA for "<<dr.d_name<<": ";
       pol.d_kind = DNSFilterEngine::PolicyKind::NODATA;
     }
-    else if(target==drop) {
+    else if(crcTarget==drop) {
       // cerr<<"Wants DROP for "<<dr.d_name<<": ";
       pol.d_kind = DNSFilterEngine::PolicyKind::Drop;
     }
-    else if(target==truncate) {
+    else if(crcTarget==truncate) {
       // cerr<<"Wants TRUNCATE for "<<dr.d_name<<": ";
       pol.d_kind = DNSFilterEngine::PolicyKind::Truncate;
     }
-    else if(target==noaction) {
+    else if(crcTarget==noaction) {
       // cerr<<"Wants NOACTION for "<<dr.d_name<<": ";
       pol.d_kind = DNSFilterEngine::PolicyKind::NoAction;
     }
     else {
       pol.d_kind = DNSFilterEngine::PolicyKind::Custom;
       pol.d_custom = dr.d_content;
-      // cerr<<"Wants custom "<<target<<" for "<<dr.d_name<<": ";
+      // cerr<<"Wants custom "<<crcTarget<<" for "<<dr.d_name<<": ";
     }
   }
   else {

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 0b794ba1ed4ffea0da55b159a849855c54767db4..11f35b0ff287f4ad6e06de7d3e9cbdc1d7b71b1b 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -528,8 +528,8 @@ vector<ComboAddress> SyncRes::getAddrs(const DNSName &qname, unsigned int depth,
         if(i->d_type == QType::A || i->d_type == QType::AAAA) {
          if(auto rec = std::dynamic_pointer_cast<ARecordContent>(i->d_content))
            ret.push_back(rec->getCA(53));
-         else if(auto rec = std::dynamic_pointer_cast<AAAARecordContent>(i->d_content))
-           ret.push_back(rec->getCA(53));
+         else if(auto aaaarec = std::dynamic_pointer_cast<AAAARecordContent>(i->d_content))
+           ret.push_back(aaaarec->getCA(53));
           done=true;
         }
       }
@@ -719,14 +719,14 @@ bool SyncRes::doCNAMECacheCheck(const DNSName &qname, const QType &qtype, vector
         ret.push_back(dr);
 
        for(const auto& signature : signatures) {
-         DNSRecord dr;
-         dr.d_type=QType::RRSIG;
-         dr.d_name=qname;
-         dr.d_ttl=j->d_ttl - d_now.tv_sec;
-         dr.d_content=signature;
-         dr.d_place=DNSResourceRecord::ANSWER;
-         dr.d_class=1;
-         ret.push_back(dr);
+         DNSRecord sigdr;
+         sigdr.d_type=QType::RRSIG;
+         sigdr.d_name=qname;
+         sigdr.d_ttl=j->d_ttl - d_now.tv_sec;
+         sigdr.d_content=signature;
+         sigdr.d_place=DNSResourceRecord::ANSWER;
+         sigdr.d_class=1;
+         ret.push_back(sigdr);
        }
 
         if(!(qtype==QType(QType::CNAME))) { // perhaps they really wanted a CNAME!

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 18bd62086c6647f0d8be0cabb5c84a745d8ba10d..40aee59ca0e43c2ab7b0d4b18522c95cbb82643f 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -90,16 +90,16 @@ void HttpResponse::setBody(const json11::Json& document)
   document.dump(this->body);
 }
 
-void HttpResponse::setErrorResult(const std::string& message, const int status)
+void HttpResponse::setErrorResult(const std::string& message, const int status_)
 {
   setBody(json11::Json::object { { "error", message } });
-  this->status = status;
+  this->status = status_;
 }
 
-void HttpResponse::setSuccessResult(const std::string& message, const int status)
+void HttpResponse::setSuccessResult(const std::string& message, const int status_)
 {
   setBody(json11::Json::object { { "result", message } });
-  this->status = status;
+  this->status = status_;
 }
 
 static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Request* req, YaHTTP::Response* resp)

diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index bb2ee8e20c4aa73c0b81c2bea6ebb7cb15413347..75498a0ded9aa21ad246830aa12b249e4dbcbd85 100644 (file)
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -177,8 +177,8 @@ static Json logGrep(const string& q, const string& fname, const string& prefix)
   }
 
   Json::array items;
-  for(const string& line : lines) {
-    items.push_back(line);
+  for(const string& iline : lines) {
+    items.push_back(iline);
   }
   return items;
 }