[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.

diff --git a/src/lib/dhcp/hwaddr.cc b/src/lib/dhcp/hwaddr.cc
index a7ec30e1daf447a58fae1f58ed404bd0b4160828..eb23b44dadb82c720a382a34ce2754d3b39bfed7 100644 (file)
--- 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 fd919b24ba8ca35bd1679826b16cf4756a56b303..bf2eb9ab0d4974e4d1382388f1b139f47ede2aea 100644 (file)
--- 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);
 }