From 1ee4d989baee8e0fe013aa0c1e63f4e6a429d114 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Wed, 12 Dec 2012 09:08:42 +0100 Subject: [PATCH] [2526] Cleanup: removed unused definition and added doxygen for a function. --- src/lib/dhcp/libdhcp++.cc | 16 ---------------- src/lib/dhcp/libdhcp++.h | 8 ++++---- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc index e6f552eacf..a76bdab39d 100644 --- a/src/lib/dhcp/libdhcp++.cc +++ b/src/lib/dhcp/libdhcp++.cc @@ -33,22 +33,6 @@ using namespace std; using namespace isc::dhcp; using namespace isc::util; -namespace { - -/// @brief A structure comprising values that are passed to -/// OptionDefinition constructor. -/// -/// This structure is used by functions that initialize -/// option definitions for standard options (V4 and V6). -struct OptionParams { - std::string name; - uint16_t code; - OptionDataType type; - bool array; -}; - -} - // static array with factories for options std::map LibDHCP::v4factories_; diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h index e855070571..370106b7ec 100644 --- a/src/lib/dhcp/libdhcp++.h +++ b/src/lib/dhcp/libdhcp++.h @@ -138,9 +138,9 @@ private: /// The method creates option definitions for all DHCPv4 options. /// Currently this function is not implemented. /// - /// @todo implemend this function. - /// - /// @throw isc::NotImplemeneted + /// @throw std::bad alloc if system went out of memory. + /// @throw MalformedOptionDefinition if any of the definitions + /// is incorrect. This is programming error. static void initStdOptionDefs4(); /// Initialize standard DHCPv6 option definitions. @@ -149,7 +149,7 @@ private: /// /// @throw std::bad_alloc if system went out of memory. /// @throw MalformedOptionDefinition if any of the definitions - /// is incorect. This is a programming error. + /// is incorrect. This is a programming error. static void initStdOptionDefs6(); /// pointers to factories that produce DHCPv6 options