From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 4 Oct 2012 06:28:18 +0000 (-0700)
Subject: [2268] style fix (brace position) and clarify variable (s/set/rdataset/)
X-Git-Tag: trac2402_base~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1137e979e1a22465feb03ee0a48499bebcdf6aae;p=thirdparty%2Fkea.git

[2268] style fix (brace position) and clarify variable (s/set/rdataset/)
---

diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 008c13110f..e1c1089a85 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -255,7 +255,8 @@ masterLoadWrapper(const char* const filename, const Name& origin,
 // The installer called from load() for the iterator version of load().
 void
 generateRRsetFromIterator(ZoneIterator* iterator,
-                          InMemoryClient::LoadCallback callback) {
+                          InMemoryClient::LoadCallback callback)
+{
     ConstRRsetPtr rrset;
     while ((rrset = iterator->getNextRRset()) != NULL) {
         callback(rrset);
diff --git a/src/lib/datasrc/memory/zone_data_updater.cc b/src/lib/datasrc/memory/zone_data_updater.cc
index ed1cbfcdb1..8cd93ba0e3 100644
--- a/src/lib/datasrc/memory/zone_data_updater.cc
+++ b/src/lib/datasrc/memory/zone_data_updater.cc
@@ -101,13 +101,13 @@ ZoneDataUpdater::addWildcards(const Name& name) {
 
 void
 ZoneDataUpdater::contextCheck(const AbstractRRset& rrset,
-                              const RdataSet* set) const
+                              const RdataSet* rdataset) const
 {
     // Ensure CNAME and other type of RR don't coexist for the same
     // owner name except with NSEC, which is the only RR that can
     // coexist with CNAME (and also RRSIG, which is handled separately)
     if (rrset.getType() == RRType::CNAME()) {
-        for (const RdataSet* sp = set; sp != NULL; sp = sp->getNext()) {
+        for (const RdataSet* sp = rdataset; sp != NULL; sp = sp->getNext()) {
             if (sp->type != RRType::NSEC()) {
                 isc_throw(AddError,
                           "CNAME can't be added with " << sp->type
@@ -115,7 +115,7 @@ ZoneDataUpdater::contextCheck(const AbstractRRset& rrset,
             }
         }
     } else if ((rrset.getType() != RRType::NSEC()) &&
-               (RdataSet::find(set, RRType::CNAME()) != NULL))
+               (RdataSet::find(rdataset, RRType::CNAME()) != NULL))
     {
         isc_throw(AddError,
                   "CNAME and " << rrset.getType() <<
@@ -128,10 +128,10 @@ ZoneDataUpdater::contextCheck(const AbstractRRset& rrset,
     if (rrset.getName() != zone_name_ &&
         // Adding DNAME, NS already there
         ((rrset.getType() == RRType::DNAME() &&
-          RdataSet::find(set, RRType::NS()) != NULL) ||
+          RdataSet::find(rdataset, RRType::NS()) != NULL) ||
          // Adding NS, DNAME already there
          (rrset.getType() == RRType::NS() &&
-          RdataSet::find(set, RRType::DNAME()) != NULL)))
+          RdataSet::find(rdataset, RRType::DNAME()) != NULL)))
     {
         isc_throw(AddError, "DNAME can't coexist with NS in non-apex domain: "
                   << rrset.getName());