maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logging: avoid empty " :" prefix 

This could happen when using item operations on the command line.
In that case a source without name was created and that empty
name was inserted as prefix before errors encountered while
using the source.

Now empty string is the same as no string.
This commit is contained in:
Patrick Ohly 2014-04-02 16:22:46 +02:00
parent de8461f802
commit c95bc08e61
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/syncevo/Logging.cpp
View File

@ -192,6 +192,9 @@ void Logger::formatLines(Level msglevel,
if (!firstLine.empty()) {
print(firstLine, 1);
}
if (prefix && prefix->empty()) {
prefix = NULL;
}
tag = StringPrintf("[%s%s%s] %s%s",
levelToStr(msglevel),
procname.c_str(),
@ -259,7 +262,7 @@ Logger::MessageOptions::MessageOptions(Level level,
const char *function,
int flags) :
m_level(level),
m_prefix(prefix),
m_prefix((!prefix || prefix->empty()) ? NULL : prefix),
m_file(file),
m_line(line),
m_function(function),