diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-09 16:12:59 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-09 16:14:13 +0100 |
| commit | e59f770ccbf61f012d148a390e7f76775ab2a02e (patch) | |
| tree | 4fd9c32775ca42490d8bf498e13049f4353c3037 /Source/Core/Common/LogManager.cpp | |
| parent | 9da6900595318620690a5cdb5094a05e17cf094e (diff) | |
Revert "Merge pull request #49 from Parlane/sprintf_tidy"
Change broke the build on Debian stable.
This reverts commit 28755439b36ac8e875d764da5db31ad693459ace, reversing
changes made to 64e01ec763d21915e7166e625f8a3e85b46fbcbb.
Diffstat (limited to 'Source/Core/Common/LogManager.cpp')
| -rw-r--r-- | Source/Core/Common/LogManager.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 5fe218b2f4..50c6ab400a 100644 --- a/Source/Core/Common/LogManager.cpp +++ b/Source/Core/Common/LogManager.cpp @@ -114,6 +114,7 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char *format, va_list args) { char temp[MAX_MSGLEN]; + char msg[MAX_MSGLEN * 2]; LogContainer *log = m_Log[type]; if (!log->IsEnabled() || level > log->GetLevel() || ! log->HasListeners()) @@ -121,15 +122,15 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, CharArrayFromFormatV(temp, MAX_MSGLEN, format, args); - std::string msg = StringFromFormat("%s %s:%u %c[%s]: %s\n", - Common::Timer::GetTimeFormatted().c_str(), - file, line, - LogTypes::LOG_LEVEL_TO_CHAR[(int)level], - log->GetShortName(), temp); + static const char level_to_char[7] = "-NEWID"; + sprintf(msg, "%s %s:%u %c[%s]: %s\n", + Common::Timer::GetTimeFormatted().c_str(), + file, line, level_to_char[(int)level], + log->GetShortName(), temp); #ifdef ANDROID - Host_SysMessage(msg.c_str()); + Host_SysMessage(msg); #endif - log->Trigger(level, msg.c_str()); + log->Trigger(level, msg); } void LogManager::Init() |