From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 19 Mar 2012 21:01:04 +0000 (-0700)
Subject: [1579] some trivial editorial/style fixes
X-Git-Tag: trac2351_base~226^2~116^2~41^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c96ac865ac20c4e80b3206a00c15fa998cb85bfd;p=thirdparty%2Fkea.git

[1579] some trivial editorial/style fixes
- removed white spaces at EOL
- add a spaece after commas
- variable naming convention (use underscored lower cased chars)
- indentation
---

diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 25351e3bf7..3f433c9b8e 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -815,14 +815,14 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
     //verify whether the zonefile is signed by NSEC3 method
     //If the NSEC3PARAMETER type exists in the zonefile,NSEC3 is definitly used
     //in this zone signature.
-    bool is_NSEC3 = false;
+    bool is_nsec3 = false;
     WantedTypes nsec3PARAM;
-    nsec3PARAM.insert(RRType::NSEC3PARAM()); 
-    const FoundRRsets NSEC3Found = getRRsets(origin_.toText(),nsec3PARAM,
-                                        false);
+    nsec3PARAM.insert(RRType::NSEC3PARAM());
+    const FoundRRsets NSEC3Found = getRRsets(origin_.toText(), nsec3PARAM,
+                                             false);
     const FoundIterator nfi(NSEC3Found.second.find(RRType::NSEC3PARAM()));
     if (nfi != NSEC3Found.second.end()) {
-        is_NSEC3 = true;
+        is_nsec3 = true;
     }
     // On entry to this method, we know that the database doesn't have any
     // entry for this name.  Before returning NXDOMAIN, we need to check
@@ -837,12 +837,14 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
             arg(accessor_->getDBName()).arg(name);
         const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) :
             ConstRRsetPtr();
-        if (is_NSEC3 == true) {
+        if (is_nsec3 == true) {
             return (ResultContext(NXRRSET, nsec,
-                                  nsec ? RESULT_NSEC_SIGNED : RESULT_NSEC3_SIGNED));
+                                  nsec ? RESULT_NSEC_SIGNED :
+                                  RESULT_NSEC3_SIGNED));
         } else {
             return (ResultContext(NXRRSET, nsec,
-                                  nsec ? RESULT_NSEC_SIGNED : RESULT_DEFAULT));
+                                  nsec ? RESULT_NSEC_SIGNED :
+                                  RESULT_DEFAULT));
         }
     } else if ((options & NO_WILDCARD) == 0) {
         // It's not an empty non-terminal and wildcard matching is not
@@ -862,7 +864,7 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
               arg(accessor_->getDBName()).arg(name).arg(type).arg(getClass());
     const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) :
         ConstRRsetPtr();
-    if (is_NSEC3 == true ) {
+    if (is_nsec3 == true) {
         return (ResultContext(NXDOMAIN, nsec,
                               nsec ? RESULT_NSEC_SIGNED : RESULT_NSEC3_SIGNED));
     } else {
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 3c878c2566..11a91d9c2c 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -2282,7 +2282,7 @@ TYPED_TEST(DatabaseClientTest, wildcardNXRRSET_NSEC) {
 }
 
 TYPED_TEST(DatabaseClientTest,dbNegativeCaseFind){
-    //ZoneFinder::find() for negative case should show whether the zone is 
+    //ZoneFinder::find() for negative case should show whether the zone is
     //signed by NSEC or NSEC3,that is good for upper layer caller.
 
     //First off, add an NSEC3PARAM RR
@@ -2301,7 +2301,7 @@ TYPED_TEST(DatabaseClientTest,dbNegativeCaseFind){
     doFindTest(this->updater_->getFinder(),
                isc::dns::Name("doesnotexist.example.org."),
                this->qtype_, this->qtype_, this->rrttl_,
-               ZoneFinder::NXDOMAIN,this->expected_rdatas_, 
+               ZoneFinder::NXDOMAIN, this->expected_rdatas_,
                this->expected_sig_rdatas_,
                ZoneFinder::RESULT_NSEC3_SIGNED);
 }