pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moved string functions from MiscFunctions to StringUtil

Browse Source
This commit is contained in:
Arthur Ice
2013-05-11 00:05:11 -07:00
parent babd3949f6
commit 373ff66240
80 changed files with 381 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/debug.cpp
+20 -8
View File
@@ -16,6 +16,8 @@
#include <unistd.h>
#include <stdarg.h>
#endif
#include "../common/StringUtil.h"
#include "../common/MiscFunctions.h"
#include "../common/platform.h"
@@ -155,39 +157,49 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) {
va_list argptr, tmpargptr;
va_start(argptr, fmt);
if (dofile) {
va_copy(tmpargptr, argptr);
vfprintf( fp[id], fmt, tmpargptr );
}
if(logCallbackFmt[id]) {
msgCallbackFmt p = logCallbackFmt[id];
va_copy(tmpargptr, argptr);
p(id, fmt, tmpargptr );
}
std::string outputMessage;
StringFormat(outputMessage, fmt, argptr);
if (pLogStatus[id] & 2) {
if (pLogStatus[id] & 8) {
fprintf(stderr, "[%s] ", LogNames[id]);
vfprintf( stderr, fmt, argptr );
std::cerr << "[" << LogNames[id] << "] ";
std::cerr << outputMessage;
}
else {
fprintf(stdout, "[%s] ", LogNames[id]);
vfprintf( stdout, fmt, argptr );
std::cout << "[" << LogNames[id] << "] ";
std::cout << outputMessage;
}
}
va_end(argptr);
if (dofile)
fprintf(fp[id], "\n");
if (pLogStatus[id] & 2) {
if (pLogStatus[id] & 8) {
fprintf(stderr, "\n");
fflush(stderr);
std::cerr << std::endl;
} else {
fprintf(stdout, "\n");
fflush(stdout);
std::cout << std::endl;
}
}
if(dofile)
fflush(fp[id]);
return true;
}