From d51c005519c4add6fd0c37bcd68b0fbe94941b2d Mon Sep 17 00:00:00 2001 From: Vincent Legout Date: Tue, 8 Nov 2016 13:26:26 +0100 Subject: [PATCH] fix some spelling mistakes --- src/bin/d2/d2_cfg_mgr.h | 2 +- src/bin/d2/d_controller.cc | 4 ++-- src/bin/d2/nc_add.cc | 2 +- src/bin/dhcp4/dhcp4_messages.mes | 2 +- src/bin/perfdhcp/command_options.cc | 2 +- src/bin/perfdhcp/perfdhcp.xml | 2 +- src/lib/dhcp/iface_mgr.cc | 2 +- src/lib/eval/tests/token_unittest.cc | 4 ++-- src/lib/eval/token.cc | 6 +++--- src/lib/eval/token.h | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h index d30274ede4..b3a2dd4bf7 100644 --- a/src/bin/d2/d2_cfg_mgr.h +++ b/src/bin/d2/d2_cfg_mgr.h @@ -128,7 +128,7 @@ public: /// @brief Returns whether or not forward updates are enabled. /// - /// This method currently uses the presence or absence of Foward DDNS + /// This method currently uses the presence or absence of Forward DDNS /// Domains to determine if forward updates are enabled or disabled. /// @todo This could be expanded to include the check of a configurable /// boolean value. diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc index d3fd9bae0d..00e1eabfe8 100644 --- a/src/bin/d2/d_controller.cc +++ b/src/bin/d2/d_controller.cc @@ -119,7 +119,7 @@ DControllerBase::launch(int argc, char* argv[], const bool test_mode) { if (rcode != 0) { LOG_FATAL(dctl_logger, DCTL_CONFIG_FILE_LOAD_FAIL) .arg(app_name_).arg(comment->stringValue()); - isc_throw (ProcessInitError, "Could Not load configration file: " + isc_throw (ProcessInitError, "Could Not load configuration file: " << comment->stringValue()); } @@ -369,7 +369,7 @@ DControllerBase::shutdownProcess(isc::data::ConstElementPtr args) { // Not really a failure, but this condition is worth noting. In reality // it should be pretty hard to cause this. LOG_WARN(dctl_logger, DCTL_NOT_RUNNING).arg(app_name_); - return (isc::config::createAnswer(0, "Process has not been initialzed.")); + return (isc::config::createAnswer(0, "Process has not been initialized.")); } void diff --git a/src/bin/d2/nc_add.cc b/src/bin/d2/nc_add.cc index 403dd588b3..3114470f81 100644 --- a/src/bin/d2/nc_add.cc +++ b/src/bin/d2/nc_add.cc @@ -199,7 +199,7 @@ NameAddTransaction::addingFwdAddrsHandler() { // Call sendUpdate() to initiate the async send. Note it also sets // next event to NOP_EVT. - sendUpdate("Foward Add"); + sendUpdate("Forward Add"); break; case IO_COMPLETED_EVT: { diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 5cc2653508..293fac72d3 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -385,7 +385,7 @@ server is about to open sockets on the specified port. A warning message issued when IfaceMgr fails to open and bind a socket. The reason for the failure is appended as an argument of the log message. -% DHCP4_PACKET_DROP_0001 failed to parse packet from %1 to %2, received over interace %3, reason: %4 +% DHCP4_PACKET_DROP_0001 failed to parse packet from %1 to %2, received over interface %3, reason: %4 The DHCPv4 server has received a packet that it is unable to interpret. The reason why the packet is invalid is included in the message. diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc index 15295006d0..32e8638d1f 100644 --- a/src/bin/perfdhcp/command_options.cc +++ b/src/bin/perfdhcp/command_options.cc @@ -1043,7 +1043,7 @@ CommandOptions::usage() const { "-L: Specify the local port to use\n" " (the value 0 means to use the default).\n" "-M: A text file containing a list of MAC addresses,\n" - " one per line. If provided, a MAC address will be choosen randomly\n" + " one per line. If provided, a MAC address will be chosen randomly\n" " from this list for every new exchange. In the DHCPv6 case, MAC\n" " addresses are used to generate DUID-LLs. This parameter must not be\n" " used in conjunction with the -b parameter.\n" diff --git a/src/bin/perfdhcp/perfdhcp.xml b/src/bin/perfdhcp/perfdhcp.xml index 775abb81f7..482523733c 100644 --- a/src/bin/perfdhcp/perfdhcp.xml +++ b/src/bin/perfdhcp/perfdhcp.xml @@ -412,7 +412,7 @@ A text file containing a list of MAC addresses, - one per line. If provided, a MAC address will be choosen randomly + one per line. If provided, a MAC address will be chosen randomly from this list for every new exchange. In the DHCPv6 case, MAC addresses are used to generate DUID-LLs. This parameter must not be used in conjunction with the -b parameter. diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc index 2e34f30688..0632bac55f 100644 --- a/src/lib/dhcp/iface_mgr.cc +++ b/src/lib/dhcp/iface_mgr.cc @@ -432,7 +432,7 @@ void IfaceMgr::stubDetectIfaces() { iface->flag_running_ = true; // Note that we claim that this is not a loopback. iface_mgr tries to open a - // socket on all interaces that are up, running and not loopback. As this is + // socket on all interfaces that are up, running and not loopback. As this is // the only interface we were able to detect, let's pretend this is a normal // interface. iface->flag_loopback_ = false; diff --git a/src/lib/eval/tests/token_unittest.cc b/src/lib/eval/tests/token_unittest.cc index 4a20ca9740..c0b96fb8e1 100644 --- a/src/lib/eval/tests/token_unittest.cc +++ b/src/lib/eval/tests/token_unittest.cc @@ -221,7 +221,7 @@ public: /// stack then executes the eval and checks the results. /// /// @param test_string The string to operate on - /// @param test_start The postion to start when getting a substring + /// @param test_start The position to start when getting a substring /// @param test_length The length of the substring to get /// @param result_string The expected result of the eval /// @param should_throw The eval will throw @@ -1748,7 +1748,7 @@ TEST_F(TokenTest, substringLength) { EXPECT_TRUE(checkFile()); } -// Test that we get nothing if the starting postion is out of the string +// Test that we get nothing if the starting position is out of the string TEST_F(TokenTest, substringStartingPosition) { // Off the front verifySubstringEval("foobar", "-7", "1", ""); diff --git a/src/lib/eval/token.cc b/src/lib/eval/token.cc index a6471929a2..c1812c5dca 100644 --- a/src/lib/eval/token.cc +++ b/src/lib/eval/token.cc @@ -489,7 +489,7 @@ TokenSubstring::evaluate(Pkt& /*pkt*/, ValueStack& values) { start_pos = boost::lexical_cast(start_str); } catch (const boost::bad_lexical_cast&) { isc_throw(EvalTypeError, "the parameter '" << start_str - << "' for the starting postion of the substring " + << "' for the starting position of the substring " << "couldn't be converted to an integer."); } try { @@ -505,7 +505,7 @@ TokenSubstring::evaluate(Pkt& /*pkt*/, ValueStack& values) { } const int string_length = string_str.length(); - // If the starting postion is outside of the string push an + // If the starting position is outside of the string push an // empty string and leave if ((start_pos < -string_length) || (start_pos >= string_length)) { values.push(""); @@ -520,7 +520,7 @@ TokenSubstring::evaluate(Pkt& /*pkt*/, ValueStack& values) { } // Adjust the values to be something for substr. We first figure out - // the starting postion, then update it and the length to get the + // the starting position, then update it and the length to get the // characters before or after it depending on the sign of length if (start_pos < 0) { start_pos = string_length + start_pos; diff --git a/src/lib/eval/token.h b/src/lib/eval/token.h index 37af93c468..031a4ad64f 100644 --- a/src/lib/eval/token.h +++ b/src/lib/eval/token.h @@ -635,7 +635,7 @@ public: /// str is the string to extract a substring from. If it is empty, an empty /// string is pushed onto the value stack. /// - /// start is the postion from which the code starts extracting the substring. + /// start is the position from which the code starts extracting the substring. /// 0 is the first character and a negative number starts from the end, with /// -1 being the last character. If the starting point is outside of the /// original string an empty string is pushed onto the value stack. -- 2.47.2