diff options
| author | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
| commit | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (patch) | |
| tree | e568d96f6d7f64c5e58b4c7cd1c4fda7e649bfc7 /common/debug.cpp | |
| parent | d7411acc2b1c7702280dbff1c3e1bafee528184b (diff) | |
| parent | e25e85fbb047fef895ede97c3c2c73451631052c (diff) | |
| download | scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.gz scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.bz2 scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/debug.cpp')
| -rw-r--r-- | common/debug.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/common/debug.cpp b/common/debug.cpp index dbbb204deb..9c3a93e5a6 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -23,16 +23,17 @@ #include "common/debug-channels.h" #include "common/system.h" #include "common/textconsole.h" +#include "common/algorithm.h" #include <stdarg.h> // For va_list etc. // TODO: Move gDebugLevel into namespace Common. int gDebugLevel = -1; -DECLARE_SINGLETON(Common::DebugManager); - namespace Common { +DECLARE_SINGLETON(DebugManager); + namespace { struct DebugLevelComperator { @@ -107,18 +108,13 @@ bool DebugManager::isDebugChannelEnabled(uint32 channel) { #ifndef DISABLE_TEXT_CONSOLE static void debugHelper(const char *s, va_list va, bool caret = true) { - char buf[STRINGBUFLEN]; + Common::String buf = Common::String::vformat(s, va); - vsnprintf(buf, STRINGBUFLEN, s, va); - buf[STRINGBUFLEN-1] = '\0'; - - if (caret) { - buf[STRINGBUFLEN-2] = '\0'; - strcat(buf, "\n"); - } + if (caret) + buf += '\n'; if (g_system) - g_system->logMessage(LogMessageType::kDebug, buf); + g_system->logMessage(LogMessageType::kDebug, buf.c_str()); // TODO: Think of a good fallback in case we do not have // any OSystem yet. } |