BIND 10 trac558, updated. 297c145c01d18f73e2b453ef968426352815dda6 [trac558] Remove trailing spaces in lines
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Feb 14 13:04:37 UTC 2011
The branch, trac558 has been updated
via 297c145c01d18f73e2b453ef968426352815dda6 (commit)
from 0d1efe0f87c1868ff5389c731dbfa7ead9416655 (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 297c145c01d18f73e2b453ef968426352815dda6
Author: Stephen Morris <stephen at isc.org>
Date: Mon Feb 14 13:04:14 2011 +0000
[trac558] Remove trailing spaces in lines
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/compiler/message.cc | 7 +++----
src/lib/log/logger.cc | 2 --
src/lib/log/logger.h | 2 +-
src/lib/log/logger_impl.cc | 2 +-
src/lib/log/logger_support.cc | 2 +-
src/lib/log/message_dictionary.cc | 6 +++---
src/lib/log/tests/message_dictionary_unittest.cc | 4 ++--
src/lib/log/tests/run_time_init_test.sh.in | 1 -
8 files changed, 11 insertions(+), 15 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc
index e3c0f91..915c99a 100644
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/message.cc
@@ -141,7 +141,7 @@ quoteString(const string& instring) {
// Create the output string and reserve the space needed to hold the input
// string. (Most input strings will not contain quotes, so this single
- // reservation should be all that is needed.)
+ // reservation should be all that is needed.)
string outstring;
outstring.reserve(instring.size());
@@ -355,7 +355,7 @@ writeProgramFile(const string& file, const string& prefix,
"#include <log/message_types.h>\n" <<
"#include <log/message_initializer.h>\n" <<
"\n";
-
+
// Declare the message symbols themselves.
writeOpeningNamespace(ccfile, ns_components);
@@ -396,7 +396,6 @@ writeProgramFile(const string& file, const string& prefix,
"} // Anonymous namespace\n" <<
"\n";
-
// Report errors (if any) and exit
if (ccfile.fail()) {
throw MessageException(MSG_MSGWRTERR, program_file.fullName(),
@@ -447,7 +446,7 @@ warnDuplicates(MessageReader& reader) {
int
main(int argc, char** argv) {
-
+
const struct option loptions[] = { // Long options
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'v'},
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index cf46741..a2465de 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -108,8 +108,6 @@ Logger::isFatalEnabled() {
// definition of the macro). Also note that it expects that the message buffer
// "message" is declared in the compilation unit.
-
-
// Output methods
void
diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h
index 8b92973..691eb73 100644
--- a/src/lib/log/logger.h
+++ b/src/lib/log/logger.h
@@ -124,7 +124,7 @@ public:
/// \brief Return DEBUG Level
///
/// \return Current setting of debug level. This is returned regardless of
- /// whether the
+ /// whether the severity is set to debug.
virtual int getDebugLevel();
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index 4f897d4..4b19360 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -42,7 +42,7 @@ LoggerImpl::LoggerInfo LoggerImpl::root_logger_info_(isc::log::INFO, 0);
LoggerImpl::LoggerImpl(const std::string& name, bool)
{
// Are we the root logger?
- if (name == getRootLoggerName()) {
+ if (name == getRootLoggerName()) {
is_root_ = true;
name_ = name;
} else {
diff --git a/src/lib/log/logger_support.cc b/src/lib/log/logger_support.cc
index 55de046..1ac4481 100644
--- a/src/lib/log/logger_support.cc
+++ b/src/lib/log/logger_support.cc
@@ -58,7 +58,7 @@ Logger logger("log");
/// \param file Name of the local message file
static void
readLocalMessageFile(const char* file) {
-
+
MessageDictionary& dictionary = MessageDictionary::globalDictionary();
MessageReader reader(&dictionary);
try {
diff --git a/src/lib/log/message_dictionary.cc b/src/lib/log/message_dictionary.cc
index 920c494..c091369 100644
--- a/src/lib/log/message_dictionary.cc
+++ b/src/lib/log/message_dictionary.cc
@@ -37,7 +37,7 @@ MessageDictionary::add(const string& ident, const string& text) {
// Message not already in the dictionary, so add it.
dictionary_[ident] = text;
}
-
+
return (not_found);
}
@@ -52,7 +52,7 @@ MessageDictionary::replace(const string& ident, const string& text) {
// Exists, so replace it.
dictionary_[ident] = text;
}
-
+
return (found);
}
@@ -68,7 +68,7 @@ MessageDictionary::load(const char* messages[]) {
const MessageID ident(messages[i++]);
if (messages[i]) {
- // Text not null, note it and point to next ident.
+ // Text not null, note it and point to next ident.
string text(messages[i++]);
// Add ID and text to message dictionary, noting if the ID was
diff --git a/src/lib/log/tests/message_dictionary_unittest.cc b/src/lib/log/tests/message_dictionary_unittest.cc
index 58ae769..a92585c 100644
--- a/src/lib/log/tests/message_dictionary_unittest.cc
+++ b/src/lib/log/tests/message_dictionary_unittest.cc
@@ -41,7 +41,7 @@ MessageInitializer init(values);
class MessageDictionaryTest : public ::testing::Test {
protected:
- MessageDictionaryTest() :
+ MessageDictionaryTest() :
alpha_id("ALPHA"), alpha_text("This is alpha"),
beta_id("BETA"), beta_text("This is beta"),
gamma_id("GAMMA"), gamma_text("This is gamma")
@@ -194,4 +194,4 @@ TEST_F(MessageDictionaryTest, GlobalLoadTest) {
string text = MessageDictionary::globalDictionary().getText("NEWSYM");
EXPECT_EQ(string("new symbol added"), text);
-}
\ No newline at end of file
+}
diff --git a/src/lib/log/tests/run_time_init_test.sh.in b/src/lib/log/tests/run_time_init_test.sh.in
index b7f7701..77502a8 100755
--- a/src/lib/log/tests/run_time_init_test.sh.in
+++ b/src/lib/log/tests/run_time_init_test.sh.in
@@ -35,7 +35,6 @@ MSGRDERR replacement read error, parameters: '%s' and '%s'
UNRECDIR replacement unrecognised directive message, parameter is '%s'
.
-
echo -n "1. runInitTest default parameters: "
cat > $tempfile << .
FATAL [alpha.example] MSGWRTERR, error writing to test1: 42
More information about the bind10-changes
mailing list