BIND 10 trac2218_2, updated. 6c447559f19adc0e040a6a6f44c06dffcf3ce0ff [2218] some more editorial fixes

[BIND 10 source code commits]

The branch, trac2218_2 has been updated
       via  6c447559f19adc0e040a6a6f44c06dffcf3ce0ff (commit)
       via  40d4887c7d706c0a27b1aef720f2a8870d26d5bb (commit)
       via  58388f2e53b8428f0ecb5936d9d6c076b2003203 (commit)
      from  208dbbaf77e781a19d6efdaca32d423ea266a6f1 (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 6c447559f19adc0e040a6a6f44c06dffcf3ce0ff
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Sep 25 14:34:27 2012 -0700

    [2218] some more editorial fixes

commit 40d4887c7d706c0a27b1aef720f2a8870d26d5bb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Sep 25 11:00:52 2012 -0700

    [2218] add suggested comment about the rationale of uint32_t for node_count_.

commit 58388f2e53b8428f0ecb5936d9d6c076b2003203
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Sep 25 10:56:19 2012 -0700

    [2218] style fix: combine two short lines

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

Summary of changes:
 src/lib/datasrc/memory/domaintree.h                |   12 +++++++++---
 .../datasrc/memory/tests/zone_finder_unittest.cc   |    4 ++--
 src/lib/datasrc/memory/zone_finder.cc              |    3 ++-
 src/lib/dns/nsec3hash.cc                           |    3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index 96a4870..1910b80 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -1307,8 +1307,7 @@ public:
     ///
     /// \return A \c DomainTreeNode that is the largest node in the
     /// tree. If there are no nodes, then \c NULL is returned.
-    const DomainTreeNode<T>*
-    largestNode() const;
+    const DomainTreeNode<T>* largestNode() const;
 
     /// \brief Get the total number of nodes in the tree
     ///
@@ -1447,8 +1446,15 @@ private:
     //@}
 
     typename DomainTreeNode<T>::DomainTreeNodePtr root_;
-    /// the node count of current tree
+
+    /// the node count of current tree.
+    ///
+    /// Note: uint32_t may look awkward, but we intentionally choose it so
+    /// that needsReturnEmptyNode_ below won't make cause extra padding
+    /// in 64-bit machines (and we can minimize the total size of this class).
+    /// 2^32 - 1 should be a reasonable max of possible number of nodes.
     uint32_t node_count_;
+
     /// search policy for domaintree
     const bool needsReturnEmptyNode_;
 };
diff --git a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
index 43115b2..f3a942c 100644
--- a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
+++ b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
@@ -1562,8 +1562,8 @@ TEST_F(InMemoryZoneFinderNSEC3Test, findNSEC3Walk) {
 
         if (nsec3_data[i].next_proof != NULL) {
             ASSERT_TRUE(result.next_proof);
-             EXPECT_EQ(Name(nsec3_data[i].next_proof).concatenate(origin),
-                       result.next_proof->getName());
+            EXPECT_EQ(Name(nsec3_data[i].next_proof).concatenate(origin),
+                      result.next_proof->getName());
         } else {
             EXPECT_FALSE(result.next_proof);
         }
diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index 55dec20..b761767 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -185,7 +185,8 @@ createFindResult(const RRClass& rrclass,
                  const RdataSet* rrset,
                  const ZoneNode* node,
                  bool wild = false,
-                 const Name* qname = NULL) {
+                 const Name* qname = NULL)
+{
     ZoneFinder::FindResultFlags flags = ZoneFinder::RESULT_DEFAULT;
     const Name* rename = NULL;
 
diff --git a/src/lib/dns/nsec3hash.cc b/src/lib/dns/nsec3hash.cc
index 5dc59b7..ee32677 100644
--- a/src/lib/dns/nsec3hash.cc
+++ b/src/lib/dns/nsec3hash.cc
@@ -194,7 +194,8 @@ DefaultNSEC3HashCreator::create(const generic::NSEC3& nsec3) const {
 
 NSEC3Hash*
 DefaultNSEC3HashCreator::create(uint8_t algorithm, uint16_t iterations,
-                                const vector<uint8_t>& salt) const {
+                                const vector<uint8_t>& salt) const
+{
     return (new NSEC3HashRFC5155(algorithm, iterations, salt));
 }