From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Sat, 14 Jan 2017 12:02:09 +0000 (+0100)
Subject: UeberBackend: prefix suspiciouos member var names with d_
X-Git-Tag: rec-4.1.0-alpha1~311^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce4a60ce451a47b1851a5a13a9fca24488d76c92;p=thirdparty%2Fpdns.git

UeberBackend: prefix suspiciouos member var names with d_
---

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 6fbd999fe7..e0383c946b 100644
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -415,13 +415,13 @@ UeberBackend::UeberBackend(const string &pname)
 
   d_negcached=0;
   d_ancount=0;
-  domain_id=-1;
+  d_domain_id=-1;
   d_cached=0;
   d_cache_ttl = ::arg().asNum("query-cache-ttl");
   d_negcache_ttl = ::arg().asNum("negquery-cache-ttl");
 
-  tid=pthread_self(); 
-  stale=false;
+  d_tid=pthread_self();
+  d_stale=false;
 
   backends=BackendMakers().all(pname=="key-only");
 }
@@ -515,7 +515,7 @@ UeberBackend::~UeberBackend()
 // this handle is more magic than most
 void UeberBackend::lookup(const QType &qtype,const DNSName &qname, DNSPacket *pkt_p, int zoneId)
 {
-  if(stale) {
+  if(d_stale) {
     L<<Logger::Error<<"Stale ueberbackend received question, signalling that we want to be recycled"<<endl;
     throw PDNSException("We are stale, please recycle");
   }
@@ -531,7 +531,7 @@ void UeberBackend::lookup(const QType &qtype,const DNSName &qname, DNSPacket *pk
     pthread_mutex_unlock(&d_mut);
   }
 
-  domain_id=zoneId;
+  d_domain_id=zoneId;
 
   d_handle.i=0;
   d_handle.qtype=qtype;
@@ -541,7 +541,7 @@ void UeberBackend::lookup(const QType &qtype,const DNSName &qname, DNSPacket *pk
 
   if(!backends.size()) {
     L<<Logger::Error<<"No database backends available - unable to answer questions."<<endl;
-    stale=true; // please recycle us!
+    d_stale=true; // please recycle us!
     throw PDNSException("We are stale, please recycle");
   }
   else {
@@ -667,7 +667,7 @@ bool UeberBackend::handle::get(DNSZoneRecord &r)
            <<" out of answers, taking next"<<endl);
       
       d_hinterBackend=parent->backends[i++];
-      d_hinterBackend->lookup(qtype,qname,pkt_p,parent->domain_id);
+      d_hinterBackend->lookup(qtype,qname,pkt_p,parent->d_domain_id);
     }
     else 
       break;
diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index 8d615ac30b..51810278d2 100644
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -135,7 +135,7 @@ public:
   bool searchRecords(const string &pattern, int maxResults, vector<DNSResourceRecord>& result);
   bool searchComments(const string &pattern, int maxResults, vector<Comment>& result);
 private:
-  pthread_t tid;
+  pthread_t d_tid;
   handle d_handle;
   vector<DNSZoneRecord> d_answers;
   vector<DNSZoneRecord>::const_iterator d_cachehandleiter;
@@ -151,13 +151,13 @@ private:
   }d_question;
 
   unsigned int d_cache_ttl, d_negcache_ttl;
-  int domain_id;
+  int d_domain_id;
   int d_ancount;
 
   bool d_negcached;
   bool d_cached;
   static bool d_go;
-  bool stale;
+  bool d_stale;
 
   int cacheHas(const Question &q, vector<DNSZoneRecord> &rrs);
   void addNegCache(const Question &q);