BIND 10 trac1198, updated. a60c96464c0b959492a13b10767a7d9352be060e [1198] a trivial cleanups: folded some long lines, and fixed indentation.

[BIND 10 source code commits]

The branch, trac1198 has been updated
       via  a60c96464c0b959492a13b10767a7d9352be060e (commit)
       via  0c0e8938a3ece603eddd70e3ebba94b03eeeeb92 (commit)
      from  614e0ed92f8e6fb5f66277c7fbec8af6149cfa39 (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 a60c96464c0b959492a13b10767a7d9352be060e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Dec 1 13:35:46 2011 -0800

    [1198] a trivial cleanups: folded some long lines, and fixed indentation.

commit 0c0e8938a3ece603eddd70e3ebba94b03eeeeb92
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Dec 1 13:35:01 2011 -0800

    [1198] a minor style fix: removed unnecessary semicolon.

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

Summary of changes:
 src/lib/datasrc/database.cc   |   21 +++++++++++----------
 tools/reorder_message_file.py |    2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 33a1417..91566b3 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -440,8 +440,8 @@ DatabaseClient::Finder::findDelegationPoint(const isc::dns::Name& name,
         // the results of some searches.)
         const bool not_origin = (i != remove_labels);
 
-        // Look if there's NS or DNAME at this point of the tree, but ignore the
-        // NS RRs at the apex of the zone.
+        // Look if there's NS or DNAME at this point of the tree, but ignore
+        // the NS RRs at the apex of the zone.
         const FoundRRsets found = getRRsets(superdomain.toText(),
                                             DELEGATION_TYPES(), not_origin);
         if (found.first) {
@@ -681,7 +681,7 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
     // for special cases.
 
     if (hasSubdomains(name.toText())) {
-        // Does the domain have a subdomain (i.e. is is an empty non-terminal)?
+        // Does the domain have a subdomain (i.e. it is an empty non-terminal)?
         // If so, return NXRRSET instead of NXDOMAIN (as although the name does
         // not exist in the zone, it does exist in the DNS tree).
         // pretend something is here as well.
@@ -692,8 +692,8 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
                            ConstRRsetPtr()));
 
     } else if ((options & NO_WILDCARD) == 0) {
-        // It's not an empty non-terminal and wildcard matching is not disabled,
-        // so check for wildcards.
+        // It's not an empty non-terminal and wildcard matching is not
+        // disabled, so check for wildcards.
         const ZoneFinder::FindResult wresult =
             findWildcardMatch(name, type, options, dresult);
         if (wresult.code == NXDOMAIN && dnssec_data) {
@@ -764,7 +764,8 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
     const bool is_origin = (name == getOrigin());
     WantedTypes final_types(FINAL_TYPES());
     final_types.insert(type);
-    const FoundRRsets found = getRRsets(name.toText(), final_types, !is_origin);
+    const FoundRRsets found = getRRsets(name.toText(), final_types,
+                                        !is_origin);
 
     // Get iterators for the different types of records we are interested in -
     // CNAME, NS and Wanted types.
@@ -773,10 +774,10 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
     const FoundIterator wti(found.second.find(type));
 
     if (!is_origin && ((options & FIND_GLUE_OK) == 0) &&
-            nsi != found.second.end()) { 
+        nsi != found.second.end()) {
         // A NS RRset was found at the domain we were searching for.  As it is
         // not at the origin of the zone, it is a delegation and indicates that
-        // this this zone is not authoritative for the data. Just return the
+        // this zone is not authoritative for the data. Just return the
         // delegation information.
         return (logAndCreateResult(name, type, DELEGATION, nsi->second,
                                    DATASRC_DATABASE_FOUND_DELEGATION_EXACT));
@@ -807,8 +808,8 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
     } else if (wti != found.second.end()) {
         // Found an RR matching the query, so return it.  (Note that this
         // includes the case where we were explicitly querying for a CNAME and
-        // found it.  It also includes the case where we were querying for an NS
-        // RRset and found it at the apex of the zone.)
+        // found it.  It also includes the case where we were querying for an
+        // NS RRset and found it at the apex of the zone.)
         return (logAndCreateResult(name, type, SUCCESS, wti->second,
                                    DATASRC_DATABASE_FOUND_RRSET));
 
diff --git a/tools/reorder_message_file.py b/tools/reorder_message_file.py
index c3511c6..3f95544 100644
--- a/tools/reorder_message_file.py
+++ b/tools/reorder_message_file.py
@@ -167,7 +167,7 @@ def processFile(filename):
     Parameters:
     filename     Name of the message file to process
     """
-    lines = open(filename).read().splitlines();
+    lines = open(filename).read().splitlines()
 
     # Search for the first line starting with the percent character.  Everything
     # before it is considered the file header and is copied to the output with