Browse Source

[2313] Trivial: updates to some comments as a result of the second review.

Marcin Siodelski 12 years ago
parent
commit
b3a9b36264
2 changed files with 5 additions and 5 deletions
  1. 3 3
      src/lib/dhcpsrv/option_space.cc
  2. 2 2
      src/lib/dhcpsrv/tests/option_space_unittest.cc

+ 3 - 3
src/lib/dhcpsrv/option_space.cc

@@ -34,14 +34,14 @@ OptionSpace::validateName(const std::string& name) {
     using namespace boost::algorithm;
 
     // Allowed characters are: lower or upper case letters, digits,
-    // underscores and dashes. Empty option spaces are not allowed.
+    // underscores and hyphens. Empty option spaces are not allowed.
     if (all(name, boost::is_from_range('a', 'z') ||
             boost::is_from_range('A', 'Z') ||
             boost::is_digit() ||
             boost::is_any_of("-_")) &&
         !name.empty() &&
-        // Hyphens are not allowed at the beginning and at
-        // the end of the option space name.
+        // Hyphens and underscores are not allowed at the beginning
+        // and at the end of the option space name.
         !all(find_head(name, 1), boost::is_any_of("-_")) &&
         !all(find_tail(name, 1), boost::is_any_of("-_"))) {
         return (true);

+ 2 - 2
src/lib/dhcpsrv/tests/option_space_unittest.cc

@@ -77,8 +77,8 @@ TEST(OptionSpaceTest, validateName) {
     EXPECT_FALSE(OptionSpace::validateName(" isc"));
     EXPECT_FALSE(OptionSpace::validateName("isc with-space"));
 
-    // Hyphens are not allowed at the beginning and at the end
-    // of the option space name.
+    // Hyphens and underscores are not allowed at the beginning
+    // and at the end of the option space name.
     EXPECT_FALSE(OptionSpace::validateName("-isc"));
     EXPECT_FALSE(OptionSpace::validateName("isc-"));
     EXPECT_FALSE(OptionSpace::validateName("_isc"));