Commit 297c145c authored by Stephen Morris's avatar Stephen Morris
Browse files

[trac558] Remove trailing spaces in lines

parent 0d1efe0f
......@@ -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'},
......
......@@ -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
......
......@@ -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();
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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
......
......@@ -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
}
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment