BIND 10 trac2526, updated. 1ee4d989baee8e0fe013aa0c1e63f4e6a429d114 [2526] Cleanup: removed unused definition and added doxygen for a function.

[BIND 10 source code commits]

The branch, trac2526 has been updated
       via  1ee4d989baee8e0fe013aa0c1e63f4e6a429d114 (commit)
       via  9e655bc3d628a2ada61d9d8f7518d655b0f84e7f (commit)
      from  21da96d4bcb34a2289e5b16eead8ce181d8eb61c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ee4d989baee8e0fe013aa0c1e63f4e6a429d114
Author: Marcin Siodelski <marcin at isc.org>
Date:   Wed Dec 12 09:08:42 2012 +0100

    [2526] Cleanup: removed unused definition and added doxygen for a function.

commit 9e655bc3d628a2ada61d9d8f7518d655b0f84e7f
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Dec 11 20:03:21 2012 +0100

    [2526] Removed static keyword from declarations.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcp/libdhcp++.cc      |   16 ----------------
 src/lib/dhcp/libdhcp++.h       |    8 ++++----
 src/lib/dhcp/std_option_defs.h |    6 +++---
 3 files changed, 7 insertions(+), 23 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index e6f552e..a76bdab 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<unsigned short, Option::Factory*> LibDHCP::v4factories_;
 
diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h
index e855070..370106b 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
diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index 1640ec9..9ea4ffe 100644
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -25,7 +25,7 @@ namespace {
 /// @param name name of the array being declared.
 /// @param types data types of fields that belong to the record.
 #ifndef RECORD_DECL
-#define RECORD_DECL(name, types...) static const OptionDataType name[] = { types }
+#define RECORD_DECL(name, types...) const OptionDataType name[] = { types }
 #endif
 
 /// @brief A pair of values: one pointing to the array holding types of
@@ -59,7 +59,7 @@ struct OptionDefParams {
 RECORD_DECL(FQDN_RECORDS, OPT_UINT8_TYPE, OPT_UINT8_TYPE, OPT_STRING_TYPE);
 
 /// @brief Definitions of standard DHCPv4 options.
-static const OptionDefParams OPTION_DEF_PARAMS4[] = {
+const OptionDefParams OPTION_DEF_PARAMS4[] = {
     { "subnet-mask", DHO_SUBNET_MASK, OPT_IPV4_ADDRESS_TYPE, false },
     { "time-offset", DHO_TIME_OFFSET, OPT_UINT32_TYPE, false },
     { "routers", DHO_ROUTERS, OPT_IPV4_ADDRESS_TYPE, true },
@@ -222,7 +222,7 @@ RECORD_DECL(VENDOR_CLASS_RECORDS, OPT_UINT32_TYPE, OPT_BINARY_TYPE);
 RECORD_DECL(VENDOR_OPTS_RECORDS, OPT_UINT32_TYPE, OPT_BINARY_TYPE);
 
 /// Standard DHCPv6 option definitions.
-static const OptionDefParams OPTION_DEF_PARAMS6[] = {
+const OptionDefParams OPTION_DEF_PARAMS6[] = {
     { "clientid", D6O_CLIENTID, OPT_BINARY_TYPE, false },
     { "serverid", D6O_SERVERID, OPT_BINARY_TYPE, false },
     { "ia-na", D6O_IA_NA, OPT_RECORD_TYPE, false, RECORD_DEF(IA_NA_RECORDS) },