[2268] minor editorial cleanups

diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 673c3387b238f00add8cae3173cd08b81e384a78..2f5fe67d97a9ab42ffbb9735101207b7f9c6f8a3 100644 (file)
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -163,7 +163,8 @@ InMemoryClient::findZoneData(const isc::dns::Name& zone_name) {
 
 result::Result
 InMemoryClient::load(const isc::dns::Name& zone_name,
-                     const std::string& filename) {
+                     const std::string& filename)
+{
     LOG_DEBUG(logger, DBG_TRACE_BASIC, DATASRC_MEMORY_MEM_LOAD).arg(zone_name).
         arg(filename);
 
@@ -173,8 +174,7 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
 }
 
 result::Result
-InMemoryClient::load(const isc::dns::Name& zone_name,
-                     ZoneIterator& iterator) {
+InMemoryClient::load(const isc::dns::Name& zone_name, ZoneIterator& iterator) {
     ZoneData* zone_data = loadZoneData(mem_sgmt_, rrclass_, zone_name,
                                        iterator);
     return (loadInternal(zone_name, string(), zone_data));
@@ -183,7 +183,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);
-    const FileNameTree::Result result = file_name_tree_->find(zone_name, &node);
+    const FileNameTree::Result result = file_name_tree_->find(zone_name,
+                                                              &node);
     if (result == FileNameTree::EXACTMATCH) {
         return (*node->getData());
     } else {

diff --git a/src/lib/datasrc/memory/zone_data_loader.cc b/src/lib/datasrc/memory/zone_data_loader.cc
index b6587feb7c3aa3542153d3b52e6da0c9430b6ac9..97c809205f67d024bdfd6f93466268ff979160e3 100644 (file)
--- a/src/lib/datasrc/memory/zone_data_loader.cc
+++ b/src/lib/datasrc/memory/zone_data_loader.cc
@@ -198,24 +198,21 @@ loadZoneDataInternal(util::MemorySegment& mem_sgmt,
     return (holder.release());
 }
 
-// A wrapper for dns::masterLoad used by load() below.  Essentially it
+// A wrapper for dns::masterLoad used by loadZoneData() below.  Essentially it
 // converts the two callback types.  Note the mostly redundant wrapper of
 // boost::bind.  It converts function<void(ConstRRsetPtr)> to
 // function<void(RRsetPtr)> (masterLoad() expects the latter).  SunStudio
 // doesn't seem to do this conversion if we just pass 'callback'.
 void
 masterLoadWrapper(const char* const filename, const Name& origin,
-                  const RRClass& zone_class,
-                  LoadCallback callback)
+                  const RRClass& zone_class, LoadCallback callback)
 {
     masterLoad(filename, origin, zone_class, boost::bind(callback, _1));
 }
 
-// The installer called from load() for the iterator version of load().
+// The installer called from the iterator version of loadZoneData().
 void
-generateRRsetFromIterator(ZoneIterator* iterator,
-                          LoadCallback callback)
-{
+generateRRsetFromIterator(ZoneIterator* iterator, LoadCallback callback) {
     ConstRRsetPtr rrset;
     while ((rrset = iterator->getNextRRset()) != NULL) {
         callback(rrset);

diff --git a/src/lib/datasrc/tests/memory/memory_client_unittest.cc b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
index ceb80d475c832183b340ca9d243f16bb0444fa72..e78067c0712fa8cd930f2bb6410800b04b246d50 100644 (file)
--- a/src/lib/datasrc/tests/memory/memory_client_unittest.cc
+++ b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
@@ -144,7 +144,8 @@ public:
                                   RRClass::IN(), RRType::SOA(), RRTTL(3600)));
             rrset->addRdata(generic::SOA(Name("ns1.example.org"),
                                          Name("bugs.x.w.example.org"),
-                                         2010012601, 3600, 300, 3600000, 1200));
+                                         2010012601, 3600, 300, 3600000,
+                                         1200));
             break;
 
         case 1: {
@@ -155,11 +156,11 @@ public:
 
             RRsetPtr rrsig(new RRset(Name("example.org"), rrclass_,
                                      RRType::RRSIG(), RRTTL(300)));
-            rrsig->addRdata(generic::RRSIG("A 5 3 "
-                                           "3600 20000101000000 20000201000000 "
+            rrsig->addRdata(generic::RRSIG("A 5 3 3600 "
+                                           "20000101000000 20000201000000 "
                                            "12345 example.org. FAKEFAKEFAKE"));
-            rrsig->addRdata(generic::RRSIG("NS 5 3 "
-                                           "3600 20000101000000 20000201000000 "
+            rrsig->addRdata(generic::RRSIG("NS 5 3 3600 "
+                                           "20000101000000 20000201000000 "
                                            "54321 example.org. "
                                            "FAKEFAKEFAKEFAKE"));
             rrset->addRRsig(rrsig);
@@ -206,7 +207,8 @@ public:
                                   RRClass::IN(), RRType::SOA(), RRTTL(3600)));
             rrset->addRdata(generic::SOA(Name("ns1.example.org"),
                                          Name("bugs.x.w.example.org"),
-                                         2010012601, 3600, 300, 3600000, 1200));
+                                         2010012601, 3600, 300, 3600000,
+                                         1200));
             break;
 
         case 1: {