[#4496] Addressed comments

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index bef6d9e539e65fa0e18453bd343fe9a393a1b561..8cf7896be0aea7d7cde46abbffa6640c282fd1d3 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -3873,7 +3873,7 @@ TEST_F(Dhcp6ParserTest, optionDataNtpServer) {
     ASSERT_TRUE(status);
     checkResult(status, 0);
 
-        // We should have one option available.
+    // We should have one option available.
     OptionContainerPtr options =
         CfgMgr::instance().getStagingCfg()->getCfgOption()->getAll(DHCP6_OPTION_SPACE);
     ASSERT_TRUE(options);

diff --git a/src/lib/dhcpsrv/cfg_option.cc b/src/lib/dhcpsrv/cfg_option.cc
index 7df192bd115c3825fce950ac480da7ab62ce5433..a88f62679dbd3732699c5c7c395bc6267329e466 100644 (file)
--- a/src/lib/dhcpsrv/cfg_option.cc
+++ b/src/lib/dhcpsrv/cfg_option.cc
@@ -353,8 +353,7 @@ CfgOption::encapsulateInternal(const OptionPtr& option) {
 
         // Add sub-option if there isn't one added already, or
         // if encapsulating space is a multiple exception.
-        OptionPtr existing = option->getOption(encap_opt.option_->getType());
-        if (multiple_encapsulating |
+        if (multiple_encapsulating ||
             !option->getOption(encap_opt.option_->getType())) {
             option->addOption(encap_opt.option_);
         }

diff --git a/src/lib/dhcpsrv/cfg_option.h b/src/lib/dhcpsrv/cfg_option.h
index 48779ce27bdcb85518649365e9cca5eaf1226351..0b7f605217a26961a2c1e851472775edf539507f 100644 (file)
--- a/src/lib/dhcpsrv/cfg_option.h
+++ b/src/lib/dhcpsrv/cfg_option.h
@@ -604,7 +604,7 @@ public:
         return (encapsulated_);
     }
 
-    /// @brief Option spaces which can encapsulate mutiple sub-options
+    /// @brief Option spaces which can encapsulate multiple sub-options
     /// of the same type.
     static std::set<std::string> multiple_encapsulating_spaces_;
 

diff --git a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
index 7dfbb84fc4e63309b36432be0d70823056772393..946261fecb5414856ad893c11b2efd2b99379ea6 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
@@ -801,7 +801,7 @@ TEST_F(CfgOptionTest, encapsulate) {
     }
 }
 
-// This test verifies that multiple encapsulating spaces are supported,
+// This test verifies that multiple encapsulating spaces are supported.
 TEST_F(CfgOptionTest, multipleEncapsulatingSpaces) {
     CfgOption cfg;