BIND 10 trac2387, updated. d124a5b6f1fb3fb55918e3b75343c6bb70023980 [2387] trivial (unrelated) cleanups: constify and indentation fix.

[BIND 10 source code commits]

The branch, trac2387 has been updated
       via  d124a5b6f1fb3fb55918e3b75343c6bb70023980 (commit)
      from  72922ff97062fbb154821827932d8a8952c371fc (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 d124a5b6f1fb3fb55918e3b75343c6bb70023980
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 12 14:52:44 2013 -0700

    [2387] trivial (unrelated) cleanups: constify and indentation fix.

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

Summary of changes:
 .../dns/rdata/generic/detail/nsec3param_common.cc  |    3 +--
 src/lib/dns/rdata/generic/dnskey_48.cc             |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
index 3fc0f0a..caa92ce 100644
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
@@ -60,8 +60,7 @@ parseNSEC3ParamFromLexer(const char* const rrtype_name,
         lexer.getNextToken(MasterToken::NUMBER).getNumber();
     if (iterations > 0xffff) {
         isc_throw(InvalidRdataText, rrtype_name <<
-                  " iterations out of range: " <<
-            iterations);
+                  " iterations out of range: " << iterations);
     }
 
     const string salthex =
diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
index da32144..31952ca 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ b/src/lib/dns/rdata/generic/dnskey_48.cc
@@ -93,9 +93,9 @@ DNSKEY::DNSKEY(InputBuffer& buffer, size_t rdata_len) {
         isc_throw(InvalidRdataLength, "DNSKEY too short: " << rdata_len);
     }
 
-    uint16_t flags = buffer.readUint16();
-    uint16_t protocol = buffer.readUint8();
-    uint16_t algorithm = buffer.readUint8();
+    const uint16_t flags = buffer.readUint16();
+    const uint16_t protocol = buffer.readUint8();
+    const uint16_t algorithm = buffer.readUint8();
 
     rdata_len -= 4;
     vector<uint8_t> keydata(rdata_len);
@@ -234,11 +234,11 @@ DNSKEY::compare(const Rdata& other) const {
         return (impl_->algorithm_ < other_dnskey.impl_->algorithm_ ? -1 : 1);
     }
 
-    size_t this_len = impl_->keydata_.size();
-    size_t other_len = other_dnskey.impl_->keydata_.size();
-    size_t cmplen = min(this_len, other_len);
-    int cmp = memcmp(&impl_->keydata_[0], &other_dnskey.impl_->keydata_[0],
-                     cmplen);
+    const size_t this_len = impl_->keydata_.size();
+    const size_t other_len = other_dnskey.impl_->keydata_.size();
+    const size_t cmplen = min(this_len, other_len);
+    const int cmp = memcmp(&impl_->keydata_[0],
+                           &other_dnskey.impl_->keydata_[0], cmplen);
     if (cmp != 0) {
         return (cmp);
     } else {
@@ -249,7 +249,7 @@ DNSKEY::compare(const Rdata& other) const {
 uint16_t
 DNSKEY::getTag() const {
     if (impl_->algorithm_ == 1) {
-        int len = impl_->keydata_.size();
+        const int len = impl_->keydata_.size();
         return ((impl_->keydata_[len - 3] << 8) + impl_->keydata_[len - 2]);
     }
 
@@ -257,7 +257,7 @@ DNSKEY::getTag() const {
     ac += (impl_->protocol_ << 8);
     ac += impl_->algorithm_;
 
-    size_t size = impl_->keydata_.size();
+    const size_t size = impl_->keydata_.size();
     for (size_t i = 0; i < size; i ++) {
         ac += (i & 1) ? impl_->keydata_[i] : (impl_->keydata_[i] << 8);
     }