[#1405] clean up

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.cc b/src/lib/dhcpsrv/parsers/base_network_parser.cc
index da165eaddb5e17e92e0503f52c5be6b308a30b55..55f3dc9ec62e4ff9c0cbe7d71130d1062e7ce10f 100644 (file)
--- a/src/lib/dhcpsrv/parsers/base_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.cc
@@ -16,10 +16,10 @@ using namespace isc::util;
 namespace isc {
 namespace dhcp {
 
-bool
+void
 BaseNetworkParser::moveReservationMode(ElementPtr config) {
     if (!config->contains("reservation-mode")) {
-        return (false);
+        return;
     }
     if (config->contains("reservations-global") ||
         config->contains("reservations-in-subnet") ||
@@ -49,7 +49,6 @@ BaseNetworkParser::moveReservationMode(ElementPtr config) {
                   << getPosition("reservation-mode", config) << ")");
     }
     config->remove("reservation-mode");
-    return (true);
 }
 
 const Triplet<uint32_t>

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.h b/src/lib/dhcpsrv/parsers/base_network_parser.h
index 2d5b4e44d3d2ef616024616328245b292de7d7d8..e66f2f9d6c58e9e63ef312f0f71c8d053229b145 100644 (file)
--- a/src/lib/dhcpsrv/parsers/base_network_parser.h
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.h
@@ -25,10 +25,7 @@ public:
     /// @param config [in/out] configuration to alter.
     /// @throw DhcpConfigError on error e.g. when both reservation-mode
     /// and a flag are specified.
-    /// @return true if reservation-mode parameter has been replaces with
-    /// new reservations-global, reservations-in-subnet and
-    /// reservations-out-of-pool parameters, false otherwise.
-    static bool moveReservationMode(isc::data::ElementPtr config);
+    static void moveReservationMode(isc::data::ElementPtr config);
 
 protected: