Fixed the Log altogether (doesn't use NULL-to-va_list assignment, compiles for RaspberryPi)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@432 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
madmaxoft@gmail.com 2012-03-25 13:29:07 +00:00
parent 5783437436
commit 534e221316
2 changed files with 6 additions and 14 deletions

View File

@ -98,15 +98,7 @@ void cLog::ClearLog()
void cLog::Log(const char * a_Format, va_list argList)
{
AString Message;
if (argList != NULL)
{
AppendVPrintf(Message, a_Format, argList);
}
else
{
// This branch needs to be here because of *nix crashing in vsnprintf() when argList is NULL
Message.assign(a_Format);
}
AppendVPrintf(Message, a_Format, argList);
time_t rawtime;
time ( &rawtime );

View File

@ -59,19 +59,19 @@ void cMCLogger::LogSimple(const char* a_Text, int a_LogType /* = 0 */ )
switch( a_LogType )
{
case 0:
Log(a_Text, 0);
LOG("%s", a_Text);
break;
case 1:
Info(a_Text, 0);
LOGINFO("%s", a_Text);
break;
case 2:
Warn(a_Text, 0);
LOGWARN("%s", a_Text);
break;
case 3:
Error(a_Text, 0);
LOGERROR("%s", a_Text);
break;
default:
Log(a_Text, 0);
LOG("(#%d#: %s", a_LogType, a_Text);
break;
}
}