BIND 10 trac2209, updated. bd8b562bcf016c70f229ba1cb7fa084035eff9e0 [2209] style fixes: folded long lines, constify, ptr vs bool

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Oct 25 23:07:41 UTC 2012


The branch, trac2209 has been updated
       via  bd8b562bcf016c70f229ba1cb7fa084035eff9e0 (commit)
      from  ecabe80cbb2483d8057a83c84faeb84ce903b555 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd8b562bcf016c70f229ba1cb7fa084035eff9e0
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Oct 25 16:07:00 2012 -0700

    [2209] style fixes: folded long lines, constify, ptr vs bool

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/client_list.cc |    9 +++++----
 src/lib/datasrc/client_list.h  |    7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 474f7a7..6813f3c 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -345,7 +345,7 @@ ConfigurableClientList::findInternal(MutableResult& candidate,
 // duplicate code, it is a thin wrapper around getCachedZoneWriter only.
 ConfigurableClientList::ReloadResult
 ConfigurableClientList::reload(const Name& name) {
-    ZoneWriterPair result(getCachedZoneWriter(name));
+    const ZoneWriterPair result(getCachedZoneWriter(name));
     if (result.second) {
         result.second->load();
         result.second->install();
@@ -412,7 +412,7 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
     }
     memory::LoadAction load_action;
     DataSourceClient* client(result.info->data_src_client_);
-    if (client) {
+    if (client != NULL) {
         // Now finally provide the writer.
         // If it does not exist in client,
         // DataSourceError is thrown, which is exactly the result what we
@@ -436,8 +436,9 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
                                   filename);
     }
     return (ZoneWriterPair(ZONE_RELOADED,
-                           ZoneWriterPtr(result.info->cache_->getZoneTableSegment().
-                                         getZoneWriter(load_action, name, rrclass_))));
+                           ZoneWriterPtr(
+                               result.info->cache_->getZoneTableSegment().
+                               getZoneWriter(load_action, name, rrclass_))));
 }
 
 // NOTE: This function is not tested, it would be complicated. However, the
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index d6344b7..ecb20a5 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -308,9 +308,10 @@ public:
     ///
     /// \param zone The origin of the zone to reload.
     /// \return The result has two parts. The first one is a status describing
-    ///     if it worked or not (and in case it didn't, also why). If the status
-    ///     is ZONE_RELOADED, the second part contains a shared pointer to the
-    ///     writer. If the status is anything else, the second part is NULL.
+    ///     if it worked or not (and in case it didn't, also why). If the
+    ///     status is ZONE_RELOADED, the second part contains a shared pointer
+    ///     to the writer. If the status is anything else, the second part is
+    ///     NULL.
     /// \throw DataSourceError or anything else that the data source
     ///      containing the zone might throw is propagated.
     /// \throw DataSourceError if something unexpected happens, like when



More information about the bind10-changes mailing list