From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 8 Oct 2012 18:32:18 +0000 (-0700)
Subject: [2292] minor cleanups: constify, indentation
X-Git-Tag: trac2402_base~15^2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b2aa97d01af2934b408caa6044cbfab4c6679f6;p=thirdparty%2Fkea.git

[2292] minor cleanups: constify, indentation
---

diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index de953ca107..a5824fa63b 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -627,11 +627,11 @@ InMemoryClient::InMemoryClientImpl::load(
     // node must point to a valid node now
     assert(node != NULL);
 
-    std::string* tstr = node->setData(new std::string(filename));
+    const std::string* tstr = node->setData(new std::string(filename));
     delete tstr;
 
-    result::Result result(zone_table_->addZone(mem_sgmt_, rrclass_,
-                                               zone_name, holder));
+    const result::Result result(zone_table_->addZone(mem_sgmt_, rrclass_,
+                                                     zone_name, holder));
     if (result == result::SUCCESS) {
         // Only increment the zone count if the zone doesn't already
         // exist.
@@ -726,8 +726,8 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
 const std::string
 InMemoryClient::getFileName(const isc::dns::Name& zone_name) const {
     const FileNameNode* node(NULL);
-    FileNameTree::Result result = impl_->file_name_tree_->find(zone_name,
-                                                               &node);
+    const FileNameTree::Result result = impl_->file_name_tree_->find(zone_name,
+                                                                     &node);
     if (result == FileNameTree::EXACTMATCH) {
         return (*node->getData());
     } else {
diff --git a/src/lib/datasrc/tests/memory/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
index 3754139620..81fa576b21 100644
--- a/src/lib/datasrc/tests/memory/domaintree_unittest.cc
+++ b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
@@ -414,7 +414,7 @@ performCallbackTest(TestDomainTree& dtree,
     // "cdtnode" may be invalid due to the insertion, so we need to re-find
     // it.
     EXPECT_EQ(TestDomainTree::EXACTMATCH, dtree.find(Name("callback.example"),
-                                                   &cdtnode));
+                                                     &cdtnode));
     EXPECT_TRUE(cdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
     EXPECT_FALSE(subdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
     EXPECT_FALSE(parentdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));