BIND 10 trac2837, updated. 91a0d273da950aac6348bbc900ceca502a6974db [2837] Fixed omissions from previous review corrections

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Apr 9 11:28:06 UTC 2013


The branch, trac2837 has been updated
       via  91a0d273da950aac6348bbc900ceca502a6974db (commit)
      from  2b7e75de166cb416a60080ad34d8acbed4fd8119 (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 91a0d273da950aac6348bbc900ceca502a6974db
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Apr 9 12:26:31 2013 +0100

    [2837] Fixed omissions from previous review corrections
    
    Added braces to a single-line "if" statement.  Also corrected
    some comments and removed trailing spaces from some statements.

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

Summary of changes:
 src/lib/dhcp/hwaddr.cc                |   11 ++++++-----
 src/lib/dhcp/tests/hwaddr_unittest.cc |    6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/hwaddr.cc b/src/lib/dhcp/hwaddr.cc
index a7ec30e..eb23b44 100644
--- a/src/lib/dhcp/hwaddr.cc
+++ b/src/lib/dhcp/hwaddr.cc
@@ -30,15 +30,16 @@ HWAddr::HWAddr()
 HWAddr::HWAddr(const uint8_t* hwaddr, size_t len, uint8_t htype)
     :hwaddr_(hwaddr, hwaddr + len), htype_(htype) {
     if (len > MAX_HWADDR_LEN) {
-        isc_throw(InvalidParameter, "hwaddr length exceeds MAX_HWADDR_LEN");    
+        isc_throw(InvalidParameter, "hwaddr length exceeds MAX_HWADDR_LEN");
     }
 }
 
 HWAddr::HWAddr(const std::vector<uint8_t>& hwaddr, uint8_t htype)
     :hwaddr_(hwaddr), htype_(htype) {
-    if (hwaddr.size() > MAX_HWADDR_LEN)
-        isc_throw(InvalidParameter, 
-            "address vector size exceeds MAX_HWADDR_LEN");    
+    if (hwaddr.size() > MAX_HWADDR_LEN) {
+        isc_throw(InvalidParameter,
+            "address vector size exceeds MAX_HWADDR_LEN");
+    }
 }
 
 std::string HWAddr::toText() const {
@@ -58,7 +59,7 @@ std::string HWAddr::toText() const {
 }
 
 bool HWAddr::operator==(const HWAddr& other) const {
-    return ((this->htype_  == other.htype_) && 
+    return ((this->htype_  == other.htype_) &&
             (this->hwaddr_ == other.hwaddr_));
 }
 
diff --git a/src/lib/dhcp/tests/hwaddr_unittest.cc b/src/lib/dhcp/tests/hwaddr_unittest.cc
index fd919b2..bf2eb9a 100644
--- a/src/lib/dhcp/tests/hwaddr_unittest.cc
+++ b/src/lib/dhcp/tests/hwaddr_unittest.cc
@@ -42,7 +42,7 @@ TEST(HWAddrTest, constructor) {
     const uint8_t htype = HTYPE_ETHER;
     vector<uint8_t> data2(data1, data1 + sizeof(data1));
 
-    // over the limit data 
+    // Over the limit data 
     vector<uint8_t> big_data_vector(HWAddr::MAX_HWADDR_LEN + 1, 0); 
 
     scoped_ptr<HWAddr> hwaddr1(new HWAddr(data1, sizeof(data1), htype));
@@ -58,11 +58,11 @@ TEST(HWAddrTest, constructor) {
     EXPECT_EQ(0, hwaddr3->hwaddr_.size());
     EXPECT_EQ(htype, hwaddr3->htype_);
 
-    // check that over the limit data length throws exception 
+    // Check that over the limit data length throws exception 
     EXPECT_THROW(HWAddr(&big_data_vector[0], big_data_vector.size(), HTYPE_ETHER), 
         InvalidParameter);
 
-    // check that over the limit vector throws exception
+    // Check that over the limit vector throws exception
     EXPECT_THROW(HWAddr(big_data_vector, HTYPE_ETHER), InvalidParameter);
 }
 



More information about the bind10-changes mailing list