From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 27 Jul 2012 07:18:32 +0000 (-0700)
Subject: [2124] some suggested changes:
X-Git-Tag: trac2351_base~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a09cb3f049e97d207fed3345a97af0458f23a345;p=thirdparty%2Fkea.git

[2124] some suggested changes:
- use !empty() instead of size() > 0.  for vectors there should be
  essentially no difference, but for other type of containers the former
  is generally better, and so I believe it's better to always follow that
  convention.
- constify
---

diff --git a/src/lib/dns/rdata/generic/sshfp_44.cc b/src/lib/dns/rdata/generic/sshfp_44.cc
index 7489f404f2..8358c74943 100644
--- a/src/lib/dns/rdata/generic/sshfp_44.cc
+++ b/src/lib/dns/rdata/generic/sshfp_44.cc
@@ -109,7 +109,7 @@ SSHFP::toWire(OutputBuffer& buffer) const {
     buffer.writeUint8(algorithm_);
     buffer.writeUint8(fingerprint_type_);
 
-    if (fingerprint_.size() > 0) {
+    if (!fingerprint_.empty()) {
         buffer.writeData(&fingerprint_[0], fingerprint_.size());
     }
 }
@@ -119,7 +119,7 @@ SSHFP::toWire(AbstractMessageRenderer& renderer) const {
     renderer.writeUint8(algorithm_);
     renderer.writeUint8(fingerprint_type_);
 
-    if (fingerprint_.size() > 0) {
+    if (!fingerprint_.empty()) {
         renderer.writeData(&fingerprint_[0], fingerprint_.size());
     }
 }
@@ -150,14 +150,15 @@ SSHFP::compare(const Rdata& other) const {
         return (1);
     }
 
-    size_t this_len = fingerprint_.size();
-    size_t other_len = other_sshfp.fingerprint_.size();
-    size_t cmplen = min(this_len, other_len);
+    const size_t this_len = fingerprint_.size();
+    const size_t other_len = other_sshfp.fingerprint_.size();
+    const size_t cmplen = min(this_len, other_len);
     if (cmplen == 0) {
         return ((this_len == other_len)
                 ? 0 : (this_len < other_len) ? -1 : 1);
     }
-    int cmp = memcmp(&fingerprint_[0], &other_sshfp.fingerprint_[0], cmplen);
+    const int cmp = memcmp(&fingerprint_[0], &other_sshfp.fingerprint_[0],
+                           cmplen);
     if (cmp != 0) {
         return (cmp);
     } else {