[1605] some almost-trivial cleanups.

diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index d36d952c2dba53a4b04eacbf156fa45c4faeeb83..bdaf2e640b190dec67b942071e43139bbf848da8 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -35,7 +35,6 @@
 #include <datasrc/memory_datasrc.h>
 #include <datasrc/rbtree.h>
 #include <datasrc/rbnode_rrset.h>
-#include <datasrc/rbnode_rrset.h>
 #include <datasrc/logger.h>
 #include <datasrc/iterator.h>
 #include <datasrc/data_source.h>

diff --git a/src/lib/datasrc/rbnode_rrset.h b/src/lib/datasrc/rbnode_rrset.h
index f34685e26806565a5e68dde2b352c51872df09b6..667ce931d88e6d0529ccaeb9b5adb683375abdca 100644 (file)
--- a/src/lib/datasrc/rbnode_rrset.h
+++ b/src/lib/datasrc/rbnode_rrset.h
@@ -28,7 +28,7 @@
 namespace isc {
 namespace datasrc {
 
-/// \brief Special RRset for optimiing memory datasource requirement
+/// \brief Special RRset for optimizing memory datasource requirement
 ///
 /// To speed up the performance of the in-memory data source, at load time
 /// associate relevant "additional section" data with each RRset in the
@@ -124,11 +124,13 @@ public:
     }
 
     virtual void addRdata(isc::dns::rdata::ConstRdataPtr) {
-        isc_throw(isc::NotImplemented, "RBNodeRRset::addRdata() not supported");
+        isc_throw(isc::NotImplemented,
+                  "RBNodeRRset::addRdata() not supported");
     }
 
     virtual void addRdata(const isc::dns::rdata::Rdata&) {
-        isc_throw(isc::NotImplemented, "RBNodeRRset::addRdata() not supported");
+        isc_throw(isc::NotImplemented,
+                  "RBNodeRRset::addRdata() not supported");
     }
 
     virtual isc::dns::RdataIteratorPtr getRdataIterator() const {

diff --git a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
index db2b7f8bf0186f0f5475a138c848bf5985b428c5..5ef4dc4d76cb8ec39adb52e0a4648cf022cc4718 100644 (file)
--- a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
+++ b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
@@ -38,7 +38,7 @@ using namespace isc::util;
 // parameterisation of the tests.
 
 namespace {
-const char* RRSIG_TXT =
+const char* const RRSIG_TXT =
     "A 5 4 43200 20100223214617 20100222214617 8496 isc.org. "
     "evxhlGx13mpKLVkKsjpGzycS5twtIoxOmlN14w9t5AgzGBmz"
     "diGdLIrFabqr72af2rUq+UDBKMWXujwZTZUTws32sVldDPk/"
@@ -74,18 +74,19 @@ protected:
         // Create the RRSIG corresponding to the rrset_a record.  The RDATA
         // won't match the A record it covers, although it is internally
         // self-consistent.
-        AbstractRRset* sig_rrset = const_cast<AbstractRRset*>(rrset_siga.get());
+        AbstractRRset* sig_rrset =
+            const_cast<AbstractRRset*>(rrset_siga.get());
         sig_rrset->addRdata(generic::RRSIG(RRSIG_TXT));
     }
 
-    Name test_name;
-    Name test_domain;
-    Name test_nsname;
+    const Name test_name;
+    const Name test_domain;
+    const Name test_nsname;
 
     RBNodeRRset rrset_a;
     RBNodeRRset rrset_a_empty;
-    RBNodeRRset rrset_ns;
-    RBNodeRRset rrset_ch_txt;
+    const RBNodeRRset rrset_ns;
+    const RBNodeRRset rrset_ch_txt;
 
     ConstRRsetPtr rrset_siga;
 };
@@ -217,29 +218,29 @@ checkSignature(const RBNodeRRset& rrset) {
 TEST_F(RBNodeRRsetTest, addRRsigConstRdataPointer) {
     EXPECT_FALSE(rrset_a.getRRsig());
     RdataPtr data = createRdata(rrset_siga->getType(), rrset_siga->getClass(),
-                                RRSIG_TXT); 
+                                RRSIG_TXT);
     ConstRdataPtr cdata(data);
-    rrset_a.addRRsig(cdata); 
+    rrset_a.addRRsig(cdata);
     checkSignature(rrset_a);
 }
 
 TEST_F(RBNodeRRsetTest, addRRsigRdataPointer) {
     EXPECT_FALSE(rrset_a.getRRsig());
     RdataPtr data = createRdata(rrset_siga->getType(), rrset_siga->getClass(),
-                                RRSIG_TXT); 
-    rrset_a.addRRsig(data); 
+                                RRSIG_TXT);
+    rrset_a.addRRsig(data);
     checkSignature(rrset_a);
 }
 
 TEST_F(RBNodeRRsetTest, addRRsigAbstractRRset) {
     EXPECT_FALSE(rrset_a.getRRsig());
-    rrset_a.addRRsig(*(rrset_siga.get())); 
+    rrset_a.addRRsig(*(rrset_siga.get()));
     checkSignature(rrset_a);
 }
 
 TEST_F(RBNodeRRsetTest, addRRsigConstantRRsetPointer) {
     EXPECT_FALSE(rrset_a.getRRsig());
-    rrset_a.addRRsig(rrset_siga); 
+    rrset_a.addRRsig(rrset_siga);
     checkSignature(rrset_a);
 }
 
@@ -248,13 +249,13 @@ TEST_F(RBNodeRRsetTest, addRRsigRRsetPointer) {
     RRsetPtr rrsig(new RRset(test_name, RRClass::IN(), RRType::RRSIG(),
                    RRTTL(3600)));
     rrsig->addRdata(generic::RRSIG(RRSIG_TXT));
-    rrset_a.addRRsig(rrsig); 
+    rrset_a.addRRsig(rrsig);
     checkSignature(rrset_a);
 }
 
 TEST_F(RBNodeRRsetTest, removeRRsig) {
     EXPECT_FALSE(rrset_a.getRRsig());
-    rrset_a.addRRsig(*(rrset_siga.get())); 
+    rrset_a.addRRsig(*(rrset_siga.get()));
     EXPECT_TRUE(rrset_a.getRRsig());
     rrset_a.removeRRsig();
     EXPECT_FALSE(rrset_a.getRRsig());