more stuff :)

diff --git a/pdns/dnsname.cc b/pdns/dnsname.cc
index 970a69ae29911ef3b4952923987dfe291ba578f7..a926b7c130baec3ce59a91a29bf08c8478a86fd4 100644 (file)
--- a/pdns/dnsname.cc
+++ b/pdns/dnsname.cc
@@ -89,10 +89,6 @@ std::string DNSName::toDNSString() const
   return ret;
 }
 
-const char* DNSName::toCString() const {
-  return this->toString().c_str();
-}
-
 size_t DNSName::length() const {
   return this->toString().length();
 }

diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index a4feb6df27099a174115d08dea4f674dc61c96fc..da3effe8cdcffe9ee5a34d4ed554087f2a8423e1 100644 (file)
--- a/pdns/dnsname.hh
+++ b/pdns/dnsname.hh
@@ -37,7 +37,6 @@ public:
 
   std::string toString() const;              //!< Our human-friendly, escaped, representation
   std::string toDNSString() const;           //!< Our representation in DNS native format
-  const char* toCString() const;             //!< Easy access to toString().c_str();
   void appendRawLabel(const std::string& str); //!< Append this unescaped label
   void prependRawLabel(const std::string& str); //!< Prepend this unescaped label
   std::vector<std::string> getRawLabels() const; //!< Individual raw unescaped labels

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index f09b361451947996864659156bb3e4814a0ed159..6ba951c8ead853d030d8b315cb62d34c26e20961 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -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/packetcache.cc b/pdns/packetcache.cc
index 12cf7fe28d386b20803b029772fea1c01689261c..62bf0e2606f4eb91876a00dcbdc268ca2b8339af 100644 (file)
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -229,10 +229,10 @@ int PacketCache::purge(const string &match)
       cmap_t::const_iterator start=iter;
 
       for(; iter != mc.d_map.end(); ++iter) {
-       if(iter->qname.toString().compare(0, zone.size(), zone) != 0) { //TODO: check if there is a nicer method for this
-         break;
-       }
-       delcount++;
+        if(iter->qname.toString().compare(0, zone.size(), zone) != 0) { //TODO: check if there is a nicer method for this
+          break;
+        }
+        delcount++;
       }
       mc.d_map.erase(start, iter);
     }

diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh
index fb8666c50e3809ea923f9061e0215b570a3d08c5..6177e8007a7d83ce9e889d76c463c5503ca960f7 100644 (file)
--- a/pdns/packetcache.hh
+++ b/pdns/packetcache.hh
@@ -124,7 +124,7 @@ private:
   vector<MapCombo> d_maps;
   MapCombo& getMap(const DNSName& qname) 
   {
-    return d_maps[burtle((const unsigned char*)qname.toCString(), qname.toString().length(), 0) % d_maps.size()];
+    return d_maps[burtle((const unsigned char*)qname.toString().c_str(), qname.toString().length(), 0) % d_maps.size()];
   }