From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 21 Sep 2012 19:47:11 +0000 (-0700)
Subject: [2218] some more trivial cleanups
X-Git-Tag: trac2351_base~37^2~1^2~3^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bf4ff4eb4a3a8095bdd5d622cab24f46a0d9834;p=thirdparty%2Fkea.git

[2218] some more trivial cleanups
---

diff --git a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
index 6000970cfa..8f27bce534 100644
--- a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
+++ b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
@@ -31,6 +31,8 @@
 
 #include <gtest/gtest.h>
 
+#include <string>
+
 using namespace std;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
@@ -242,7 +244,7 @@ public:
              nsec3_data = NSEC3Data::create(mem_sgmt_, nsec3_rdata);
              zone_data_->setNSEC3Data(nsec3_data);
         } else {
-             size_t salt_len = nsec3_data->getSaltLen();
+             const size_t salt_len = nsec3_data->getSaltLen();
              const uint8_t* salt_data = nsec3_data->getSaltData();
              const vector<uint8_t>& salt_data_2 = nsec3_rdata.getSalt();
 
@@ -256,16 +258,16 @@ public:
              }
         }
 
-        ZoneNode *node;
+        ZoneNode* node;
         nsec3_data->insertName(mem_sgmt_, rrset->getName(), &node);
 
         // We assume that rrsig has already been checked to match rrset
         // by the caller.
-        RdataSet *set = RdataSet::create(mem_sgmt_, encoder_,
-                                         rrset, ConstRRsetPtr());
-        RdataSet *old_set = node->setData(set);
-        if (old_set != NULL) {
-             RdataSet::destroy(mem_sgmt_, class_, old_set);
+        RdataSet* rdset = RdataSet::create(mem_sgmt_, encoder_,
+                                           rrset, ConstRRsetPtr());
+        RdataSet* old_rdset = node->setData(rdset);
+        if (old_rdset != NULL) {
+             RdataSet::destroy(mem_sgmt_, class_, old_rdset);
         }
         zone_data_->setSigned(true);
     }
diff --git a/src/lib/datasrc/memory/zone_finder.h b/src/lib/datasrc/memory/zone_finder.h
index 8cad679b88..f508a25089 100644
--- a/src/lib/datasrc/memory/zone_finder.h
+++ b/src/lib/datasrc/memory/zone_finder.h
@@ -24,6 +24,8 @@
 #include <dns/rrtype.h>
 #include <dns/nsec3hash.h>
 
+#include <string>
+
 namespace isc {
 namespace datasrc {
 namespace memory {
diff --git a/src/lib/dns/nsec3hash.cc b/src/lib/dns/nsec3hash.cc
index f19fd7dcab..d6f40ddccf 100644
--- a/src/lib/dns/nsec3hash.cc
+++ b/src/lib/dns/nsec3hash.cc
@@ -169,7 +169,8 @@ std::string
 NSEC3Hash::calculate(const Name& name,
                      const uint16_t iterations,
                      const uint8_t* salt,
-                     size_t salt_len) {
+                     size_t salt_len)
+{
     // We first need to normalize the name by converting all upper case
     // characters in the labels to lower ones.
     OutputBuffer obuf(Name::MAX_WIRE);