[3268] Fixed a couple of typos during a review.

diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index e12557be64e61f968e8e06cfe49693e94393ffd0..08032213a82bb309cc5b11468ddcfccdb43e38ab 100644 (file)
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -53,7 +53,7 @@ public:
         return (DCfgContextBasePtr(new D2CfgContext(*this)));
     }
 
-    /// @brief Fetches a reference to the D2params
+    /// @brief Fetches a reference to the D2Params
     D2ParamsPtr& getD2Params() {
         return (d2_params_);
     }
@@ -243,7 +243,7 @@ protected:
     ///
     /// Iterates over the set of parameters, creating a parser based on the
     /// parameter's id and then invoking its build method passing in the
-    /// paramter's configuration value.
+    /// parameter's configuration value.
     ///
     /// @param params_config set of scalar configuration elements to parse
     virtual void buildParams(isc::data::ConstElementPtr params_config);

diff --git a/src/bin/d2/d2_config.cc b/src/bin/d2/d2_config.cc
index d93304765173ae98e2d9e052a3d3da843e270b61..3865063dec7e5b7de23036b8e0a4e399376ba9f2 100644 (file)
--- a/src/bin/d2/d2_config.cc
+++ b/src/bin/d2/d2_config.cc
@@ -38,8 +38,8 @@ const char *D2Params::DFT_NCR_FORMAT = "JSON";
 D2Params::D2Params(const isc::asiolink::IOAddress& ip_address,
                    const size_t port,
                    const size_t dns_server_timeout,
-                   const dhcp_ddns:: NameChangeProtocol& ncr_protocol,
-                   const dhcp_ddns:: NameChangeFormat& ncr_format)
+                   const dhcp_ddns::NameChangeProtocol& ncr_protocol,
+                   const dhcp_ddns::NameChangeFormat& ncr_format)
     : ip_address_(ip_address),
     port_(port),
     dns_server_timeout_(dns_server_timeout),

diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index e9ce245616d4221ad99fc33a78af894a53747a01..acd58bc814cb49ecf75895723d6f36e8b1e3e95d 100644 (file)
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -207,7 +207,7 @@ D2Process::configure(isc::data::ConstElementPtr config_set) {
 
     if (rcode) {
         // Non-zero means we got an invalid configuration, take no further
-        // action.  In integrated mode, this will send a failed response back
+        // action. In integrated mode, this will send a failed response back
         // to BIND10.
         reconf_queue_flag_ = false;
         return (answer);

diff --git a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
index a9c476b9e595bfdb962a20bd2df313c0069b5694..be9caa7fdd044c65b3bc85f1d74d5395deaf0349 100644 (file)
--- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
@@ -39,7 +39,7 @@ class D2CfgMgrTest : public ConfigParseTest {
 public:
 
     /// @brief Constructor
-    D2CfgMgrTest():cfg_mgr_(new D2CfgMgr), d2_params_() {
+    D2CfgMgrTest():cfg_mgr_(new D2CfgMgr()), d2_params_() {
     }
 
     /// @brief Destructor