BIND 10 trac1063, updated. 3ce7b09732207eac03998fa5e267672760e475c9 [1063] a couple of style fixes

[BIND 10 source code commits]

The branch, trac1063 has been updated
       via  3ce7b09732207eac03998fa5e267672760e475c9 (commit)
      from  e021b84f7fc20b3e3927093ed87e9c873d33a443 (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 3ce7b09732207eac03998fa5e267672760e475c9
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Aug 15 17:24:29 2011 +0200

    [1063] a couple of style fixes

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

Summary of changes:
 src/lib/datasrc/database.cc |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 6afd3dc..287602a 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -51,7 +51,7 @@ DatabaseClient::findZone(const Name& name) const {
                            ZoneFinderPtr(new Finder(database_,
                                                     zone.second, name))));
     }
-    // Than super domains
+    // Then super domains
     // Start from 1, as 0 is covered above
     for (size_t i(1); i < name.getLabelCount(); ++i) {
         isc::dns::Name superdomain(name.split(i));
@@ -276,7 +276,7 @@ DatabaseClient::Finder::getRRset(const isc::dns::Name& name,
     if (result_rrset) {
         sig_store.appendSignatures(result_rrset);
     }
-    return std::pair<bool, isc::dns::RRsetPtr>(records_found, result_rrset);
+    return (std::pair<bool, isc::dns::RRsetPtr>(records_found, result_rrset));
 }
 
 
@@ -298,16 +298,17 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
     try {
         // First, do we have any kind of delegation (NS/DNAME) here?
         Name origin(getOrigin());
-        size_t originLabelCount(origin.getLabelCount());
-        size_t currentLabelCount(name.getLabelCount());
+        size_t origin_label_count(origin.getLabelCount());
+        size_t current_label_count(name.getLabelCount());
         // This is how many labels we remove to get origin
-        size_t removeLabels(currentLabelCount - originLabelCount);
+        size_t remove_labels(current_label_count - origin_label_count);
+
         // Now go trough all superdomains from origin down
-        for (int i(removeLabels); i > 0; -- i) {
+        for (int i(remove_labels); i > 0; --i) {
             Name superdomain(name.split(i));
             // Look if there's NS or DNAME (but ignore the NS in origin)
             found = getRRset(superdomain, NULL, false, true,
-                             i != removeLabels);
+                             i != remove_labels);
             if (found.second) {
                 // We found something redirecting somewhere else
                 // (it can be only NS or DNAME here)