From 25f0bb96ddbe5adc6538e68c2d6eb2da6bcc7c0c Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Tue, 8 May 2012 15:23:06 -0700 Subject: [PATCH] [1964] small cleanups for checkExcessPlaceholders. - style fixes - constify (also for replacePlaceholder) - make sure all parameters are used regardless of ENABLE_LOGGER_CHECKS --- src/lib/log/log_formatter.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/log/log_formatter.cc b/src/lib/log/log_formatter.cc index 885f499dfc..c9ecdd3b3f 100644 --- a/src/lib/log/log_formatter.cc +++ b/src/lib/log/log_formatter.cc @@ -25,7 +25,7 @@ void replacePlaceholder(string* message, const string& arg, const unsigned placeholder) { - string mark("%" + lexical_cast(placeholder)); + const string mark("%" + lexical_cast(placeholder)); size_t pos(message->find(mark)); if (pos != string::npos) { do { @@ -48,17 +48,19 @@ replacePlaceholder(string* message, const string& arg, } void -checkExcessPlaceholders(string* message, unsigned int placeholder) -{ -#ifdef ENABLE_LOGGER_CHECKS - string mark("%" + lexical_cast(placeholder)); - size_t pos(message->find(mark)); +checkExcessPlaceholders(string* message, unsigned int placeholder) { + const string mark("%" + lexical_cast(placeholder)); + const size_t pos(message->find(mark)); if (pos != string::npos) { +#ifdef ENABLE_LOGGER_CHECKS // Excess placeholders were found, so throw an exception isc_throw(MismatchedPlaceholders, - "Excess logger placeholders still exist in message: " << *message); - } + "Excess logger placeholders still exist in message: " + << *message); +#else + message->append(" @@Excess logger placeholders still exist@@"); #endif /* ENABLE_LOGGER_CHECKS */ + } } }