From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 8 Jun 2015 18:24:34 +0000 (+0200)
Subject: no cerr
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~58^2~21^2~5^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66ddf73d3ad81aadc76a802b87cdeefd32045cec;p=thirdparty%2Fpdns.git

no cerr
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 8710219158..e64fa8cae2 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -886,11 +886,6 @@ void Bind2Backend::queueReloadAndStore(unsigned int id)
 bool Bind2Backend::findBeforeAndAfterUnhashed(BB2DomainInfo& bbd, const DNSName& qname, DNSName& unhashed, string& before, string& after)
 {
   shared_ptr<const recordstorage_t> records = bbd.d_records.get();
-
-//  BOOST_FOREACH(const Bind2DNSRecord& bdr, *records) {
-//    cerr<<"Hash: "<<bdr.qname.toString()<<"\t"<< (qname < bdr.qname) <<"\t"<<qname.toString()<<endl;
-//  }
-
   recordstorage_t::const_iterator iter = records->upper_bound(qname);
 
   if (before.empty()){
@@ -928,7 +923,7 @@ bool Bind2Backend::findBeforeAndAfterUnhashed(BB2DomainInfo& bbd, const DNSName&
     after = (iter)->qname.labelReverse().toString(" ",false);
   }
 
-  cerr<<"Before: '"<<before<<"', after: '"<<after<<"'\n";
+  // cerr<<"Before: '"<<before<<"', after: '"<<after<<"'\n";
   return true;
 }
 
diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index b9f61e257e..de5eee0491 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -167,13 +167,13 @@ void DNSPacket::addRecord(const DNSResourceRecord &rr)
 {
   // this removes duplicates from the packet in case we are not compressing
   // for AXFR, no such checking is performed!
-  cerr<<"addrecord, content=["<<rr.content<<"]"<<endl;
+  // cerr<<"addrecord, content=["<<rr.content<<"]"<<endl;
   if(d_compress)
     for(vector<DNSResourceRecord>::const_iterator i=d_rrs.begin();i!=d_rrs.end();++i) 
       if(rr.qname==i->qname && rr.qtype==i->qtype && rr.content==i->content) {
           return;
       }
-  cerr<<"added to d_rrs"<<endl;
+  // cerr<<"added to d_rrs"<<endl;
   d_rrs.push_back(rr);
 }
 
@@ -303,7 +303,7 @@ void DNSPacket::wrapup()
     try {
       uint8_t maxScopeMask=0;
       for(pos=d_rrs.begin(); pos < d_rrs.end(); ++pos) {
-        cerr<<"during wrapup, content=["<<pos->content<<"]"<<endl;
+        // cerr<<"during wrapup, content=["<<pos->content<<"]"<<endl;
         maxScopeMask = max(maxScopeMask, pos->scopeMask);
 
         if(!pos->content.empty() && pos->qtype.getCode()==QType::TXT && pos->content[0]!='"') {
diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index 917d1eb072..ddd8e357cb 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -199,13 +199,13 @@ DNSPacketWriter::nmap_t::iterator find(DNSPacketWriter::nmap_t& nmap, const DNSN
 // this is the absolute hottest function in the pdns recursor
 void DNSPacketWriter::xfrName(const DNSName& name, bool compress)
 {
-  cerr<<"xfrName: name=["<<name.toString()<<"] compress="<<compress<<endl;
+  //cerr<<"xfrName: name=["<<name.toString()<<"] compress="<<compress<<endl;
   // string label = d_lowerCase ? toLower(Label) : Label;
   // FIXME: we ignore d_lowerCase for now
-  cerr<<"xfrName writing ["<<name.toString()<<"]"<<endl;
+  // cerr<<"xfrName writing ["<<name.toString()<<"]"<<endl;
   std::vector<std::string> parts = name.getRawLabels();
   // labelparts_t parts;
-  cerr<<"labelcount: "<<parts.size()<<endl;
+  // cerr<<"labelcount: "<<parts.size()<<endl;
 
   if(d_canonic)
     compress=false;
@@ -226,14 +226,14 @@ void DNSPacketWriter::xfrName(const DNSName& name, bool compress)
   /* FIXME400: if we are not compressing, there is no reason to work per-label */
   for(auto &label: parts) {
     if(d_lowerCase) label=toLower(label);
-    cerr<<"xfrName labelpart ["<<label<<"], left to write ["<<towrite.toString()<<"]"<<endl;
+    //cerr<<"xfrName labelpart ["<<label<<"], left to write ["<<towrite.toString()<<"]"<<endl;
 
     auto li=d_namemap.end();
     // see if we've written out this domain before
-    cerr<<"compress="<<compress<<", searching? for compression pointer to '"<<towrite.toString()<<"', "<<d_namemap.size()<<" cmp-records"<<endl;
+    //cerr<<"compress="<<compress<<", searching? for compression pointer to '"<<towrite.toString()<<"', "<<d_namemap.size()<<" cmp-records"<<endl;
     if(compress && (li=find(d_namemap, towrite))!=d_namemap.end()) {
-      cerr<<"doing compression, my label=["<<label<<"] found match ["<<li->first.toString()<<"]"<<endl;
-      cerr<<"\tFound a compression pointer to '"<<towrite.toString()<<"': "<<li->second<<endl;
+      //cerr<<"doing compression, my label=["<<label<<"] found match ["<<li->first.toString()<<"]"<<endl;
+      //cerr<<"\tFound a compression pointer to '"<<towrite.toString()<<"': "<<li->second<<endl;
       if (d_record.size() - startRecordSize + label.size() > 253) // chopped does not include a length octet for the first label and the root label
         throw MOADNSException("DNSPacketWriter::xfrName() found overly large (compressed) name");
       uint16_t offset=li->second;
@@ -246,13 +246,13 @@ void DNSPacketWriter::xfrName(const DNSName& name, bool compress)
     if(li==d_namemap.end() && pos< 16384) {
       //      cerr<<"\tStoring a compression pointer to '"<<chopped<<"': "<<pos<<endl;
       d_namemap.push_back(make_pair(towrite, pos));                       //  if untrue, we need to count - also, don't store offsets > 16384, won't work
-      cerr<<"stored ["<<towrite.toString()<<"] at pos "<<pos<<endl;
+      //cerr<<"stored ["<<towrite.toString()<<"] at pos "<<pos<<endl;
     }
 
     startPos=pos;
 
     char labelsize=label.size();
-    cerr<<"labelsize = "<<int(labelsize)<<" for label ["<<label<<"]"<<endl;
+    //cerr<<"labelsize = "<<int(labelsize)<<" for label ["<<label<<"]"<<endl;
     d_record.push_back(labelsize);
     unsigned int len=d_record.size();
     d_record.resize(len + labelsize);