From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 25 Jun 2014 16:59:03 +0000 (+0200)
Subject: [3407] Fixed a couple of typos and other minor issues.
X-Git-Tag: trac3434_base~4^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ade8283d32d4fd550ad21c7b55862ade1bcf8ee8;p=thirdparty%2Fkea.git

[3407] Fixed a couple of typos and other minor issues.
---

diff --git a/src/bin/d2/d2_messages.mes b/src/bin/d2/d2_messages.mes
index bb3f312abb..6ac82ad2c1 100644
--- a/src/bin/d2/d2_messages.mes
+++ b/src/bin/d2/d2_messages.mes
@@ -135,7 +135,7 @@ its configuration from file and encountered an error.  This is likely due to
 invalid content in the configuration file.  The application should continue
 to operate under its current configuration.
 
-% DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD OS signal %1 received, reloading configurationfrom file: %2
+% DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD OS signal %1 received, reloading configuration from file: %2
 This is an informational message indicating the application has received a signal
 instructing it to reload its configuration from file.
 
@@ -466,8 +466,9 @@ to shut down by the controller.
 This is an informational message indicating the application has received a signal
 instructing it to shutdown.
 
-% DHCP_DDNS_SIGNAL_ERROR signal handler for signal %1,  threw an unexpected exception: %2
-This is an error message indicating that the application encountered an unexpected error after receiving a signal.  This is a programmatic error and should be
+% DHCP_DDNS_SIGNAL_ERROR signal handler for signal %1, threw an unexpected exception: %2
+This is an error message indicating that the application encountered an unexpected
+error after receiving a signal.  This is a programmatic error and should be
 reported.  While The application will likely continue to operating, it may be
 unable to respond correctly to signals.
 
diff --git a/src/bin/d2/d_controller.h b/src/bin/d2/d_controller.h
index 8ac6312596..6724a76258 100644
--- a/src/bin/d2/d_controller.h
+++ b/src/bin/d2/d_controller.h
@@ -293,7 +293,7 @@ protected:
     /// -# SIGHUP - instigates reloading the configuration file
     /// -# SIGINT - instigates a graceful shutdown
     /// -# SIGTERM - instigates a graceful shutdown
-    /// If if received any other signal, it will issue a debug statement and
+    /// If received any other signal, it will issue a debug statement and
     /// discard it.
     /// Derivations wishing to support additional signals could override this
     /// method with one that: processes the signal if it is one of additional
diff --git a/src/bin/d2/io_service_signal.cc b/src/bin/d2/io_service_signal.cc
index 9c097f6328..d5ea2e8e4a 100644
--- a/src/bin/d2/io_service_signal.cc
+++ b/src/bin/d2/io_service_signal.cc
@@ -105,10 +105,10 @@ IOSignalQueue::popSignal(IOSignalId sequence_id) {
                    "signal not found for sequence_id: " << sequence_id);
     }
 
-    // Save the siganl so we can return it.
+    // Save the signal so we can return it.
     IOSignalPtr signal = ((*it).second);
 
-    // Delete it fromt the queue.
+    // Delete it from the queue.
     signals_.erase(it);
 
     // Return the signal.
diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc
index 02015fe220..12ee89b7d8 100644
--- a/src/lib/asiolink/interval_timer.cc
+++ b/src/lib/asiolink/interval_timer.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011, 2104 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
diff --git a/src/lib/asiolink/interval_timer.h b/src/lib/asiolink/interval_timer.h
index 6e45c8ef9d..3c6f1af88e 100644
--- a/src/lib/asiolink/interval_timer.h
+++ b/src/lib/asiolink/interval_timer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011, 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
@@ -119,7 +119,7 @@ public:
     /// \throw isc::BadValue interval is less than or equal to 0
     /// \throw isc::Unexpected internal runtime error
     void setup(const Callback& cbfunc, const long interval,
-                    const Mode& = REPEATING);
+                    const Mode& mode = REPEATING);
 
     /// Cancel the timer.
     ///
diff --git a/src/lib/asiolink/tests/interval_timer_unittest.cc b/src/lib/asiolink/tests/interval_timer_unittest.cc
index ff27b3cd1b..234f43c3c0 100644
--- a/src/lib/asiolink/tests/interval_timer_unittest.cc
+++ b/src/lib/asiolink/tests/interval_timer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011, 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
@@ -300,7 +300,7 @@ TEST_F(IntervalTimerTest, overwriteIntervalTimer) {
     EXPECT_EQ(itimer.getInterval(), 100);
 }
 
-// This test verifies that timers operate correclty based on their mode.
+// This test verifies that timers operate correctly based on their mode.
 TEST_F(IntervalTimerTest, intervalModeTest) {
     // Create a timer to control the duration of the test.
     IntervalTimer test_timer(io_service_);