From 403a3a4249e316194545a54f3eb60bd2f815da41 Mon Sep 17 00:00:00 2001
From: Otto <otto.moerbeek@open-xchange.com>
Date: Mon, 8 Feb 2021 09:31:20 +0100
Subject: [PATCH] some d_* locals

---
 pdns/dnspacket.cc     | 14 +++++++-------
 pdns/responsestats.cc |  4 ++--
 pdns/signingpipe.cc   |  6 +++---
 pdns/stubresolver.cc  |  6 +++---
 pdns/ws-auth.cc       |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 51f8c7c40b..d1707aa990 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -164,10 +164,10 @@ vector<DNSZoneRecord*> DNSPacket::getAnswerRecords()
 {
   vector<DNSZoneRecord*> arrs;
 
-  for(auto & d_rr : d_rrs)
+  for(auto & rr : d_rrs)
     {
-      if(d_rr.dr.d_place!=DNSResourceRecord::ADDITIONAL)
-        arrs.push_back(&d_rr);
+      if(rr.dr.d_place!=DNSResourceRecord::ADDITIONAL)
+        arrs.push_back(&rr);
     }
   return arrs;
 }
@@ -524,12 +524,12 @@ try
     if(edo.d_extFlags & EDNSOpts::DNSSECOK)
       d_dnssecOk=true;
 
-    for(const auto & d_option : edo.d_options) {
-      if(d_option.first == EDNSOptionCode::NSID) {
+    for(const auto & option : edo.d_options) {
+      if(option.first == EDNSOptionCode::NSID) {
         d_wantsnsid=true;
       }
-      else if(s_doEDNSSubnetProcessing && (d_option.first == EDNSOptionCode::ECS)) { // 'EDNS SUBNET'
-        if(getEDNSSubnetOptsFromString(d_option.second, &d_eso)) {
+      else if(s_doEDNSSubnetProcessing && (option.first == EDNSOptionCode::ECS)) { // 'EDNS SUBNET'
+        if(getEDNSSubnetOptsFromString(option.second, &d_eso)) {
           //cerr<<"Parsed, source: "<<d_eso.source.toString()<<", scope: "<<d_eso.scope.toString()<<", family = "<<d_eso.scope.getNetwork().sin4.sin_family<<endl;
           d_haveednssubnet=true;
         } 
diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc
index 9e5fcdd010..fefa35c69e 100644
--- a/pdns/responsestats.cc
+++ b/pdns/responsestats.cc
@@ -63,8 +63,8 @@ map<uint16_t, uint64_t> ResponseStats::getQTypeResponseCounts()
 map<uint16_t, uint64_t> ResponseStats::getSizeResponseCounts()
 {
   map<uint16_t, uint64_t> ret;
-  for(const auto & d_sizecounter : d_sizecounters) {
-    ret[d_sizecounter.first]=d_sizecounter.second;
+  for(const auto & sizecounter : d_sizecounters) {
+    ret[sizecounter.first]=sizecounter.second;
   }
   return ret;
 }
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 020011ce47..b859bae7ec 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -132,12 +132,12 @@ pair<vector<int>, vector<int> > ChunkedSigningPipe::waitForRW(bool rd, bool wr,
 {
   vector<pollfd> pfds;
 
-  for(int & d_socket : d_sockets) {    
-    if(d_eof.count(d_socket))  
+  for(int & socket : d_sockets) {    
+    if(d_eof.count(socket))  
       continue;
     struct pollfd pfd;
     memset(&pfd, 0, sizeof(pfd));
-    pfd.fd = d_socket;
+    pfd.fd = socket;
     if(rd)
       pfd.events |= POLLIN;
     if(wr)
diff --git a/pdns/stubresolver.cc b/pdns/stubresolver.cc
index 3910c52424..3951be74b3 100644
--- a/pdns/stubresolver.cc
+++ b/pdns/stubresolver.cc
@@ -159,10 +159,10 @@ int stubDoResolve(const DNSName& qname, uint16_t qtype, vector<DNSZoneRecord>& r
     if(mdp.d_header.rcode == RCode::ServFail)
       continue;
 
-    for(const auto & d_answer : mdp.d_answers) {
-      if(d_answer.first.d_place == 1 && d_answer.first.d_type==qtype) {
+    for(const auto & answer : mdp.d_answers) {
+      if(answer.first.d_place == 1 && answer.first.d_type==qtype) {
         DNSZoneRecord zrr;
-        zrr.dr = d_answer.first;
+        zrr.dr = answer.first;
         zrr.auth=true;
         ret.push_back(zrr);
       }
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index ef5b9c777a..674446ccbf 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -189,8 +189,8 @@ void AuthWebServer::printargs(ostringstream &ret)
   ret<<R"(<table border=1><tr><td colspan=3 bgcolor="#0000ff"><font color="#ffffff">Arguments</font></td>)"<<endl;
 
   vector<string>entries=arg().list();
-  for(const auto & entrie : entries) {
-    ret<<"<tr><td>"<<entrie<<"</td><td>"<<arg()[entrie]<<"</td><td>"<<arg().getHelp(entrie)<<"</td>"<<endl;
+  for(const auto & entry : entries) {
+    ret<<"<tr><td>"<<entry<<"</td><td>"<<arg()[entry]<<"</td><td>"<<arg().getHelp(entry)<<"</td>"<<endl;
   }
 }
 
-- 
2.47.2