Core: Fix more warnings, add new function sLog.outStaticDebug() that replaces DEBUG_LOG

--HG--
branch : trunk

2 files changed, 13 insertions, 6 deletions

diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 3856769cbae..500701d0491 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -734,6 +734,18 @@ void Log::outDebug(const char * str, ...)
     fflush(stdout);
 }
 
+void Log::outStaticDebug(const char * fmt, ...)
+{
+    #ifdef TRINITY_DEBUG
+    va_list ap;
+    char str[2048];
+    va_start(ap, str);
+    vsnprintf(str, 2048, fmt, ap);
+    va_end(ap);
+    outDebug(str);
+    #endif
+}
+
 void Log::outStringInLine(const char * str, ...)
 {
     if (!str)
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index fb584d42c27..fc8eddf4c6b 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -104,6 +104,7 @@ class Log
         void outBasic( const char * str, ... )                  ATTR_PRINTF(2,3);
         void outDetail( const char * str, ... )                 ATTR_PRINTF(2,3);
         void outDebug( const char * str, ... )                  ATTR_PRINTF(2,3);
+        void outStaticDebug( const char * str, ... )            ATTR_PRINTF(2,3);
         void outDebugInLine( const char * str, ... )            ATTR_PRINTF(2,3);
         void outErrorDb( const char * str, ... )                ATTR_PRINTF(2,3);
         void outChar( const char * str, ... )                   ATTR_PRINTF(2,3);
@@ -174,11 +175,5 @@ class Log
 
 #define sLog (*ACE_Singleton<Log, ACE_Thread_Mutex>::instance())
 
-#ifdef TRINITY_DEBUG
-#define DEBUG_LOG sLog.outDebug
-#else
-#define DEBUG_LOG
-#endif
-
 #endif