flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Move Format issues

Browse Source
This commit is contained in:
Tycho 2014-03-11 13:51:56 -07:00
parent f64f879027
commit a19f5fc484
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CommandOutput.h
View File

@ -17,7 +17,7 @@ public:
virtual ~cCommandOutputCallback() {}; // Force a virtual destructor in subclasses virtual ~cCommandOutputCallback() {}; // Force a virtual destructor in subclasses
/// Syntax sugar function, calls Out() with Printf()-ed parameters; appends a "\n" /// Syntax sugar function, calls Out() with Printf()-ed parameters; appends a "\n"
void Out(const char * a_Fmt, ...); void Out(const char * a_Fmt, ...) FORMATSTRING(2,3);
/// Called when the command wants to output anything; may be called multiple times /// Called when the command wants to output anything; may be called multiple times
virtual void Out(const AString & a_Text) = 0; virtual void Out(const AString & a_Text) = 0;

2
src/Log.cpp
View File

@ -118,7 +118,7 @@ void cLog::Log(const char * a_Format, va_list argList)
AString Line; AString Line;
#ifdef _DEBUG #ifdef _DEBUG
Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%04zu|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#else #else
Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#endif #endif

4
src/Log.h
View File

@ -14,8 +14,8 @@ private:
public: public:
cLog(const AString & a_FileName); cLog(const AString & a_FileName);
~cLog(); ~cLog();
void Log(const char * a_Format, va_list argList); void Log(const char * a_Format, va_list argList) FORMATSTRING(2,0);
void Log(const char * a_Format, ...); void Log(const char * a_Format, ...) FORMATSTRING(2,3);
// tolua_begin // tolua_begin
void SimpleLog(const char * a_String); void SimpleLog(const char * a_String);
void OpenLog(const char * a_FileName); void OpenLog(const char * a_FileName);