bring rcpgenerator into the world of namespaces.hh, plus remove some debugging form...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1455 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 3e83f0941952188a5cab3f9beef2f21a3e0e1d72..e7bf3713cc7284dc24a69de32359009f51e15480 100644 (file)
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -23,7 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include "base64.hh"
-using namespace boost;
+#include "namespaces.hh"
 
 RecordTextReader::RecordTextReader(const string& str, const string& zone) : d_string(str), d_zone(zone), d_pos(0), d_end(str.size())
 {
@@ -77,7 +77,6 @@ void RecordTextReader::xfrTime(uint32_t &val)
 
   tm.tm_year-=1900;
   tm.tm_mon-=1;
-  
   val=(uint32_t)timegm(&tm);
 }
 

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 541efdcb86c80b7f2a7bdcdfa6858382bdf452b3..38b18410313d8257ac6511852edac182b9762319 100644 (file)
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -150,7 +150,6 @@ struct SlaveSenderReceiver
   void deliverAnswer(DomainInfo& i, uint32_t serial)
   {
     d_serials[i.id]=serial;
-    //cerr<<"Got a serial of "<<serial<<" for "<<i.zone<<endl;
   }
   
   Resolver d_resolver;
@@ -192,7 +191,7 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
     }
   }
   L<<Logger::Warning<<"Received serial number updates for "<<ssr.d_serials.size()<<" zones"<<endl;
-  int suckRequests=0;
+
   BOOST_FOREACH(DomainInfo& di, sdomains) {
     if(!ssr.d_serials.count(di.id)) 
       continue;
@@ -209,9 +208,7 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
     else {
       L<<Logger::Warning<<"Domain "<< di.zone<<" is stale, master serial "<<theirserial<<", our serial "<< ourserial <<endl;
       addSuckRequest(di.zone, *di.masters.begin());
-      suckRequests++;
     }
   }
-  L<<Logger::Warning<<"Attempted "<<suckRequests<<" zone transfers"<<endl;
 }