From bfd73e5b96b007991038454551738ef8db60ddb4 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Fri, 16 Jan 2015 20:58:13 -0600 Subject: [PATCH] Remove some more old log callbacks --- common/debug.cpp | 23 ----------------------- common/debug.h | 3 --- 2 files changed, 26 deletions(-) diff --git a/common/debug.cpp b/common/debug.cpp index 874de6aa6..2bf685cbf 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -61,12 +61,6 @@ static const char* LogNames[EQEmuLog::MaxLogID] = { "Status", "Normal", "Error", EQEmuLog::EQEmuLog() { - for (int i = 0; i < MaxLogID; i++) { - fp[i] = 0; - logCallbackFmt[i] = nullptr; - logCallbackBuf[i] = nullptr; - logCallbackPva[i] = nullptr; - } pLogStatus[EQEmuLog::LogIDs::Status] = LOG_LEVEL_STATUS; pLogStatus[EQEmuLog::LogIDs::Normal] = LOG_LEVEL_NORMAL; pLogStatus[EQEmuLog::LogIDs::Error] = LOG_LEVEL_ERROR; @@ -166,11 +160,6 @@ bool EQEmuLog::write(LogIDs id, const char *fmt, ...) logger.Log(id, vStringFormat(fmt, argptr).c_str()); - if (logCallbackFmt[id]) { - msgCallbackFmt p = logCallbackFmt[id]; - va_copy(tmpargptr, argptr); - p(id, fmt, tmpargptr ); - } return true; } @@ -208,11 +197,6 @@ bool EQEmuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list va_copy(tmpargptr, argptr); vfprintf( fp[id], fmt, tmpargptr ); } - if (logCallbackPva[id]) { - msgCallbackPva p = logCallbackPva[id]; - va_copy(tmpargptr, argptr); - p(id, prefix, fmt, tmpargptr ); - } if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "[%s] %s", LogNames[id], prefix); @@ -301,10 +285,6 @@ bool EQEmuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) fwrite(buf, size, count, fp[id]); fprintf(fp[id], "\n"); } - if (logCallbackBuf[id]) { - msgCallbackBuf p = logCallbackBuf[id]; - p(id, buf, size, count); - } if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "[%s] ", LogNames[id]); @@ -442,7 +422,6 @@ void EQEmuLog::SetCallback(LogIDs id, msgCallbackFmt proc) if (id >= MaxLogID) { return; } - logCallbackFmt[id] = proc; } void EQEmuLog::SetCallback(LogIDs id, msgCallbackBuf proc) @@ -453,7 +432,6 @@ void EQEmuLog::SetCallback(LogIDs id, msgCallbackBuf proc) if (id >= MaxLogID) { return; } - logCallbackBuf[id] = proc; } void EQEmuLog::SetCallback(LogIDs id, msgCallbackPva proc) @@ -464,7 +442,6 @@ void EQEmuLog::SetCallback(LogIDs id, msgCallbackPva proc) if (id >= MaxLogID) { return; } - logCallbackPva[id] = proc; } void EQEmuLog::SetAllCallbacks(msgCallbackFmt proc) diff --git a/common/debug.h b/common/debug.h index da97fb0de..120b332de 100644 --- a/common/debug.h +++ b/common/debug.h @@ -123,9 +123,6 @@ private: */ uint8 pLogStatus[MaxLogID]; - msgCallbackFmt logCallbackFmt[MaxLogID]; - msgCallbackBuf logCallbackBuf[MaxLogID]; - msgCallbackPva logCallbackPva[MaxLogID]; }; extern EQEmuLog* LogFile;