BIND 10 trac998, updated. 04e7fe3f480462d288c17bd121a368b74292cfd3 [trac998] Fixed final points raised by Jinmei

[BIND 10 source code commits]

The branch, trac998 has been updated
       via  04e7fe3f480462d288c17bd121a368b74292cfd3 (commit)
      from  ea15d26afc9ced4a11aea6733ea3df0969c5618b (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 04e7fe3f480462d288c17bd121a368b74292cfd3
Author: Stephen Morris <stephen at isc.org>
Date:   Fri Jun 24 14:48:32 2011 +0100

    [trac998] Fixed final points raised by Jinmei

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

Summary of changes:
 src/lib/acl/ip_check.h |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/acl/ip_check.h b/src/lib/acl/ip_check.h
index e05cd9c..619d8ed 100644
--- a/src/lib/acl/ip_check.h
+++ b/src/lib/acl/ip_check.h
@@ -178,6 +178,10 @@ public:
     /// program will fail to compile if a required specialisation is not
     /// provided.
     ///
+    /// It is expected that matches() will extract the address information from
+    /// the Context structure, and use compare() to actually perform the
+    /// comparison.
+    ///
     /// \param context Information to be matched
     virtual bool matches(const Context& context) const;
 
@@ -214,6 +218,7 @@ public:
             if (mask_[i] == 0xff) {
                 // All bits set in this byte
                 count += 8;
+                continue;
 
             } else if (mask_[i] != 0) {
                 // Only some bits set in this byte.  Count them.
@@ -222,11 +227,8 @@ public:
                     count += byte & 0x01;   // Add one if the bit is set
                     byte >>= 1;             // Go for next bit
                 }
-            } else {
-                // Encountered a zero byte, so exit - there are no more bits
-                // set.
-                break;
             }
+            break;
         }
         return (count);
     }
@@ -237,6 +239,7 @@ public:
     }
     ///@}
 
+protected:
     /// \brief Comparison
     ///
     /// This is the actual comparison function that checks the IP address passed