whitespace, comments, improve an error message

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

diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index dfc9586961db0e493d2c4cbca2543e19323f121e..4e5114d0066f02914283c733ac67569783239490 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -1,9 +1,7 @@
 // $Id$ 
 #include <string>
 #include <map>
-
 #include "pdns/namespaces.hh"
-
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
 #include "gmysqlbackend.hh"
@@ -12,10 +10,7 @@
 #include "pdns/ahuexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
-
 #include "smysql.hh"
-
-
 #include <sstream>
 
 gMySQLBackend::gMySQLBackend(const string &mode, const string &suffix)  : GSQLBackend(mode,suffix)

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index f732ec4bb83cccc8d385cc75e7e5ad04db1621ea..2c75825421c00f6465bd89a9aa7530602acb9293 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -158,6 +158,8 @@ void DNSPacket::clearRecords()
 
 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!
   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) {

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 06c7e0602d4e6872dce8984361d3e0a1dcfcb25a..d0cbbb221f67fb186a951182e84168bab635fa1c 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2011  PowerDNS.COM BV
+    Copyright (C) 2002-2012  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2
@@ -344,7 +344,7 @@ void *TCPNameserver::doConnection(void *data)
     L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
   }
   catch(NetworkError &e) {
-    L<<Logger::Info<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
+    L<<Logger::Info<<"TCP Connection Thread died because of network error: "<<e.what()<<endl;
   }
 
   catch(std::exception &e) {