BIND 10 trac998, updated. 79ec6c320ec5c24036856fd6b589ba8bf8b26ffc [trac998] simple, mostly editorial suggested fixes.

[BIND 10 source code commits]

The branch, trac998 has been updated
       via  79ec6c320ec5c24036856fd6b589ba8bf8b26ffc (commit)
      from  8f5fafa643f2d908b9e97b6d08aeb55c4b96addf (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 79ec6c320ec5c24036856fd6b589ba8bf8b26ffc
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jun 22 23:48:41 2011 -0700

    [trac998] simple, mostly editorial suggested fixes.

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

Summary of changes:
 src/lib/acl/ip_check.h                 |   16 ++++++++--------
 src/lib/acl/tests/ip_check_unittest.cc |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/acl/ip_check.h b/src/lib/acl/ip_check.h
index 818e2ca..2240d3f 100644
--- a/src/lib/acl/ip_check.h
+++ b/src/lib/acl/ip_check.h
@@ -152,9 +152,9 @@ public:
     /// \param address IP address to check for (as an address in host-byte
     ///        order).  Note host-byte order - this is different to the IPV6
     ///        constructor.
-    /// \param prefixlen The prefix length specified as an integer between 0 and
-    ///        32. This determines the number of bits of the address to check.
-    ///        (A value of zero imples match all IPV4 addresses.)
+    /// \param prefixlen The prefix length specified as an integer between 0
+    ///        and 32. This determines the number of bits of the address to
+    ///        check. (A value of zero imples match all IPV4 addresses.)
     IPCheck(uint32_t address, int prefixlen = 8 * IPV4_SIZE) :
             address_(IPV4_SIZE), mask_(), family_(AF_INET)
     {
@@ -175,8 +175,9 @@ public:
     ///
     /// \param address IP address to check for (as an address in network-byte
     ///        order).
-    /// \param mask The network mask specified as an integer between 1 and
-    ///        128 This determines the number of bits in the mask to check.
+    /// \param prefixlen The prefix length specified as an integer between 0
+    ///        and 128.  This determines the number of bits of the address to
+    ///        check.
     IPCheck(const uint8_t* address, int prefixlen = 8 * IPV6_SIZE) :
             address_(address, address + IPV6_SIZE), mask_(), family_(AF_INET6)
     {
@@ -197,8 +198,7 @@ public:
     ///        address).  If "n" is specified as zero, the match is for any
     ///        address in that address family.  The address can also be
     ///        given as "any4" or "any6".
-    IPCheck(const std::string& ipprefix) : address_(), mask_(), family_(0)
-    {
+    IPCheck(const std::string& ipprefix) : address_(), mask_(), family_(0) {
         // Check for special cases first.
         if (ipprefix == "any4") {
             family_ = AF_INET;
@@ -210,7 +210,7 @@ public:
 
             // General address prefix.  Split into address part and prefix
             // length.
-            std::pair<std::string, int> result =
+            const std::pair<std::string, int> result =
                 internal::splitIPAddress(ipprefix);
 
             // Try to convert the address.  If successful, the result is in
diff --git a/src/lib/acl/tests/ip_check_unittest.cc b/src/lib/acl/tests/ip_check_unittest.cc
index a8cc73f..fe25408 100644
--- a/src/lib/acl/tests/ip_check_unittest.cc
+++ b/src/lib/acl/tests/ip_check_unittest.cc
@@ -77,7 +77,7 @@ struct GeneralAddress {
     // Check that the IPV4 address is the same as that given.
     bool equals(uint32_t address) {
         if (addr.size() == IPV4_SIZE) {
-            vector<uint8_t> byte_address = convertUint32(address);
+            const vector<uint8_t> byte_address = convertUint32(address);
             return (equal(byte_address.begin(), byte_address.end(),
                            addr.begin()));
         }