From: Francis Dupont Date: Sat, 14 Mar 2015 18:14:25 +0000 (+0100) Subject: [master] spelling X-Git-Tag: trac3764_base~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f0413cb630afd628066c588e6fa6f42c346d9cf;p=thirdparty%2Fkea.git [master] spelling --- diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc index 7bff8bde49..66149b775c 100644 --- a/src/lib/log/compiler/message.cc +++ b/src/lib/log/compiler/message.cc @@ -195,7 +195,7 @@ sortedIdentifiers(MessageDictionary& dictionary) { /// The $NAMESPACE directive may well specify a namespace in the form a::b. /// Unfortunately, the C++ "namespace" statement can only accept a single /// string - to set up the namespace of "a::b" requires two statements, one -/// for "namspace a" and the other for "namespace b". +/// for "namespace a" and the other for "namespace b". /// /// This function returns the set of namespace components as a vector of /// strings. A vector of one element, containing the empty string, is returned @@ -252,7 +252,7 @@ writeClosingNamespace(ostream& output, const vector& ns) { /// \brief Write python file /// /// Writes the python file containing the symbol definitions as module level -/// constants. These are objects which register themself at creation time, +/// constants. These are objects which register themselves at creation time, /// so they can be replaced by dictionary later. /// /// \param file Name of the message file. The source code is written to a file @@ -403,8 +403,8 @@ replaceNonAlphaNum(char c) { /// of objects declared outside functions) gets run.) /// /// There _may_ be a problem when we come to port this to Windows. Microsoft -/// Visual Studio contains a "Whole Program Optimisation" option, where the -/// optimisation is done at link-time, not compiler-time. In this it _may_ +/// Visual Studio contains a "Whole Program Optimization" option, where the +/// optimization is done at link-time, not compiler-time. In this it _may_ /// decide to remove the initializer object because of a lack of references /// to it. But until BIND-10 is ported to Windows, we won't know. /// diff --git a/src/lib/log/interprocess/README b/src/lib/log/interprocess/README index e910a3a922..6f48dc67aa 100644 --- a/src/lib/log/interprocess/README +++ b/src/lib/log/interprocess/README @@ -2,10 +2,10 @@ The files in this directory implement a helper sub-library of the inter process locking for the log library. We use our own locks because such locks are only available in relatively recent versions of log4cplus. Also (against our usual practice) we somehow re-invented -an in-house version of such a general purose library rather than +an in-house version of such a general purpose library rather than existing proven tools such as boost::interprocess. While we decided to go with the in-house version for the log library at least until we -completely swith to log4cplus's native lock support, no other BIND 10 +completely switch to log4cplus's native lock support, no other BIND 10 module should use this; they should use existing external tools/libraries. diff --git a/src/lib/log/log_formatter.h b/src/lib/log/log_formatter.h index d336b30973..72ae996320 100644 --- a/src/lib/log/log_formatter.h +++ b/src/lib/log/log_formatter.h @@ -106,7 +106,7 @@ replacePlaceholder(std::string* message, const std::string& replacement, /// And if we did not deactivate the original Formatter, that one would get /// destroyed before any call to .arg, producing an output, and then the one /// the .arg calls are called on would get destroyed as well, producing output -/// again. So, think of this behaviour as soul moving from one to another. +/// again. So, think of this behavior as soul moving from one to another. template class Formatter { private: /// \brief The logger we will use to output the final message. diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h index 797591bb93..0b24ae6288 100644 --- a/src/lib/log/logger.h +++ b/src/lib/log/logger.h @@ -142,7 +142,7 @@ public: /// /// 1. Constructing a logger by instantiating it with a specific name. (If the /// same logger is in multiple functions within a file, overhead can be -/// minimised by declaring it as a file-wide static variable.) +/// minimized by declaring it as a file-wide static variable.) /// 2. Using the error(), info() etc. methods to log an error. (However, it is /// recommended to use the LOG_ERROR, LOG_INFO etc. macros defined in macros.h. /// These will avoid the potentially-expensive evaluation of arguments if the @@ -168,7 +168,7 @@ public: /// initialization (which causes problems on some operating systems). /// /// \note Note also that there is no constructor taking a std::string. This - /// minimises the possibility of initializing a static logger with a + /// minimizes the possibility of initializing a static logger with a /// string, so leading to problems mentioned above. Logger(const char* name) : loggerptr_(NULL) { diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h index 1296a5e873..2ccc83ba21 100644 --- a/src/lib/log/logger_level_impl.h +++ b/src/lib/log/logger_level_impl.h @@ -37,7 +37,7 @@ namespace log { /// and the idea of DEBUG has been extended, as will be seen below. In /// Kea terms, this is known as "severity"; the "logging level" usage will /// usually be used when talking about log4cplus aspects of the idea (as -/// log4cplus uses that teminology). +/// log4cplus uses that terminology). /// /// Debug level: This is a number that ranges from 0 to 99 and is used by the /// application to control the detail of debug output. A value of 0 gives the @@ -103,7 +103,7 @@ public: /// DEBUG0 being equivalent to DEBUG, the standard log level. If the name /// is DEBUGn but n lies outside the range of debug levels, debug level /// specifies is coerced to the nearest valid value. If the string is just - /// not recognised, a NOT_SET_LOG_LEVEL is returned. + /// not recognized, a NOT_SET_LOG_LEVEL is returned. /// /// \param level String representing the logging level. /// diff --git a/src/lib/log/logger_support.cc b/src/lib/log/logger_support.cc index 6b33f71086..02176365fb 100644 --- a/src/lib/log/logger_support.cc +++ b/src/lib/log/logger_support.cc @@ -110,7 +110,7 @@ setDefaultLoggingOutput(bool verbose) { } } else { - // Not a recognised destination, assume a file. + // Not a recognized destination, assume a file. option.destination = OutputOption::DEST_FILE; option.filename = dest; } diff --git a/src/lib/log/logger_support.h b/src/lib/log/logger_support.h index be9e4da9ec..1080ecb411 100644 --- a/src/lib/log/logger_support.h +++ b/src/lib/log/logger_support.h @@ -52,7 +52,7 @@ void setLoggingInitialized(bool state = true); /// /// - Name of the root logger /// - The severity (and if applicable, debug level) for the root logger. -/// - Name of a local message file, containing localisation of message text. +/// - Name of a local message file, containing localization of message text. /// /// This function is likely to change over time as more debugging options are /// held in the configuration database. diff --git a/src/lib/log/logger_unittest_support.h b/src/lib/log/logger_unittest_support.h index 3dd88fe920..358bf52935 100644 --- a/src/lib/log/logger_unittest_support.h +++ b/src/lib/log/logger_unittest_support.h @@ -21,7 +21,7 @@ /// \file /// \brief Miscellaneous logging functions used by the unit tests. /// -/// As the configuration database is unsually unavailable during unit tests, +/// As the configuration database is usually unavailable during unit tests, /// the functions defined here allow a limited amount of logging configuration /// through the use of environment variables diff --git a/src/lib/log/logging.dox b/src/lib/log/logging.dox index 89e128c1be..9486543349 100644 --- a/src/lib/log/logging.dox +++ b/src/lib/log/logging.dox @@ -84,7 +84,7 @@ address and a level of 70 records every update of the round-trip time. Like severities, levels are cumulative; so if level 25 is set as the debug level, all debug messages associated levels 0 to 25 (inclusive) -will be output. In fact, it is probably easier to visualise the debug +will be output. In fact, it is probably easier to visualize the debug levels as part of the severity system: @code FATAL Most severe @@ -268,7 +268,7 @@ blank lines are ignored. Although there are few restriction on what can be in the message -identifcation and text, there are a number of conventions used by Kea, +identification and text, there are a number of conventions used by Kea, both in the contents of the message and in the usage. All code should adhere to these: @@ -331,7 +331,7 @@ message identification - appears in the Kea message manual. It should:
    -
  • Describe the serverity of the message (debug, informational etc.)
    • +
  • Describe the severity of the message (debug, informational etc.)
  • Expand on the text of the message. In some cases, such as debug messages, the message text may provide more or less sufficient @@ -471,7 +471,7 @@ which is in the repository - is accessed through the "top_srcdir" macro. The BUILT_SOURCES line notifies the Automake that the .h and .cc files need to be created before they can be used in the compilation, so -instructs it to organse things so that the message compiler is run first. +instructs it to organize things so that the message compiler is run first. As the .mes file is not directly included in any compilation, it will not be automatically copied into a distribution created through this diff --git a/src/lib/log/message_dictionary.h b/src/lib/log/message_dictionary.h index 3d622cdf2a..0dfc6306c9 100644 --- a/src/lib/log/message_dictionary.h +++ b/src/lib/log/message_dictionary.h @@ -118,7 +118,7 @@ public: /// /// \param elements null-terminated array of const char* alternating ID and /// message text. This should be an odd number of elements long, the last - /// elemnent being NULL. If it is an even number of elements long, the + /// element being NULL. If it is an even number of elements long, the /// last ID is ignored. /// /// \return Vector of message IDs that were not loaded because an ID of the @@ -134,7 +134,7 @@ public: /// \param ident Message identification /// /// \return Text associated with message or empty string if the ID is not - /// recognised. (Note: this precludes an ID being associated with an empty + /// recognized. (Note: this precludes an ID being associated with an empty /// string.) virtual const std::string& getText(const MessageID& ident) const { return(getText(boost::lexical_cast(ident))); @@ -148,7 +148,7 @@ public: /// \param ident Message identification /// /// \return Text associated with message or empty string if the ID is not - /// recognised. (Note: this precludes an ID being associated with an empty + /// recognized. (Note: this precludes an ID being associated with an empty /// string.) virtual const std::string& getText(const std::string& ident) const; diff --git a/src/lib/log/tests/logger_example.cc b/src/lib/log/tests/logger_example.cc index 79d49ffad1..6899c173a4 100644 --- a/src/lib/log/tests/logger_example.cc +++ b/src/lib/log/tests/logger_example.cc @@ -65,7 +65,7 @@ void usage() { " -l logger Give the name of the logger to which the following\n" " output specifications will apply.\n" "\n" -"Each logger is followed by the indication of the serverity it is logging\n" +"Each logger is followed by the indication of the severity it is logging\n" "and, if applicable, its debug level:\n" "\n" " -d dbglevel Debug level. Only interpreted if the severity is 'debug'\n" @@ -158,7 +158,7 @@ int main(int argc, char** argv) { cur_opt.stream = OutputOption::STR_STDERR; } else { - cerr << "Unrecognised console option: " << optarg << "\n"; + cerr << "Unrecognized console option: " << optarg << "\n"; return (1); } break; @@ -259,7 +259,7 @@ int main(int argc, char** argv) { default: - std::cerr << "Unrecognised option: " << + std::cerr << "Unrecognized option: " << static_cast(option) << "\n"; return (1); } diff --git a/src/lib/log/tests/logger_level_impl_unittest.cc b/src/lib/log/tests/logger_level_impl_unittest.cc index 1a0dee310d..bdfebd4a2c 100644 --- a/src/lib/log/tests/logger_level_impl_unittest.cc +++ b/src/lib/log/tests/logger_level_impl_unittest.cc @@ -154,7 +154,7 @@ TEST_F(LoggerLevelImplTest, FromString) { EXPECT_EQ(log4cplus::NOT_SET_LOG_LEVEL, LoggerLevelImpl::logLevelFromString("DEBU")); EXPECT_EQ(log4cplus::NOT_SET_LOG_LEVEL, - LoggerLevelImpl::logLevelFromString("unrecognised")); + LoggerLevelImpl::logLevelFromString("unrecognized")); } // ... and check the conversion back again. All levels should convert to "DEBUG". diff --git a/src/lib/log/tests/logger_manager_unittest.cc b/src/lib/log/tests/logger_manager_unittest.cc index 660f6fd40b..c3d3579e53 100644 --- a/src/lib/log/tests/logger_manager_unittest.cc +++ b/src/lib/log/tests/logger_manager_unittest.cc @@ -72,7 +72,7 @@ public: option.destination = OutputOption::DEST_FILE; option.filename = name_; - // Set target output to the file logger. The defauls indicate + // Set target output to the file logger. The defaults indicate // INFO severity. spec_.setName(logname_); spec_.addOutputOption(option); diff --git a/src/lib/log/tests/logger_name_unittest.cc b/src/lib/log/tests/logger_name_unittest.cc index 6358e08b37..f162d6be83 100644 --- a/src/lib/log/tests/logger_name_unittest.cc +++ b/src/lib/log/tests/logger_name_unittest.cc @@ -52,13 +52,13 @@ TEST_F(LoggerNameTest, RootNameSetGet) { setRootLoggerName(name1); EXPECT_EQ(name1, getRootLoggerName()); - // We could not test that the root logger name is initialised + // We could not test that the root logger name is initialized // correctly (as there is one instance of it and we don't know // when this test will be run) so to check that setName() actually // does change the name, run the test again with a different name. // // (There was always the outside chance that the root logger name - // was initialised with name1 and that setName() has no effect.) + // was initialized with name1 and that setName() has no effect.) setRootLoggerName(name2); EXPECT_EQ(name2, getRootLoggerName()); } diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc index e0d7b9a33b..e20a941bdd 100644 --- a/src/lib/log/tests/logger_unittest.cc +++ b/src/lib/log/tests/logger_unittest.cc @@ -247,7 +247,7 @@ TEST_F(LoggerTest, EffectiveSeverityInheritance) { EXPECT_EQ(isc::log::INFO, parent.getEffectiveSeverity()); EXPECT_EQ(isc::log::INFO, child.getEffectiveSeverity()); - // Change the parwnt's severity and check it is reflects in the child. + // Change the parent's severity and check it is reflects in the child. parent.setSeverity(isc::log::WARN); EXPECT_EQ(isc::log::WARN, parent.getEffectiveSeverity()); EXPECT_EQ(isc::log::WARN, child.getEffectiveSeverity()); diff --git a/src/lib/log/tests/message_reader_unittest.cc b/src/lib/log/tests/message_reader_unittest.cc index d0214a4dd6..a024d23c7e 100644 --- a/src/lib/log/tests/message_reader_unittest.cc +++ b/src/lib/log/tests/message_reader_unittest.cc @@ -97,7 +97,7 @@ processLineException(MessageReader& reader, const char* what, } } -// Check that it recognises invalid directives +// Check that it recognizes invalid directives TEST_F(MessageReaderTest, InvalidDirectives) { @@ -170,7 +170,7 @@ TEST_F(MessageReaderTest, Namespace) { EXPECT_NO_THROW(reader_.processLine("$NAMESPACE isc::log")); EXPECT_EQ(string("isc::log"), reader_.getNamespace()); - // Check that the indication of the anonymous namespace will be recognised. + // Check that the indication of the anonymous namespace will be recognized. reader_.clearNamespace(); EXPECT_NO_THROW(reader_.processLine("$NAMESPACE ::")); EXPECT_EQ(string("::"), reader_.getNamespace());