From 2acd2f1d9701aeeddc2e086e44d95ccd3497f679 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Thu, 2 Apr 2015 21:43:14 +0200
Subject: Core/World: Remove va_list from World::RecordTimeDiff. * also split
 it in ResetTimeDiffRecord() and RecordTimeDiff() to avoid passing of null
 values.

(cherry picked from commit c9b0c8a0ca6183f11d026fb8d6caaa7b476159ce)

Conflicts:
	src/server/game/World/World.cpp
---
 src/server/game/World/World.cpp | 26 +++++++++++---------------
 src/server/game/World/World.h   |  3 ++-
 2 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 1469805c1b8..00e0abfa922 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2008,28 +2008,24 @@ void World::SetInitialWorldSettings()
         sLog->SetRealmId(realmId);
 }
 
-void World::RecordTimeDiff(const char *text, ...)
+void World::ResetTimeDiffRecord()
 {
     if (m_updateTimeCount != 1)
         return;
-    if (!text)
-    {
-        m_currentTime = getMSTime();
+
+    m_currentTime = getMSTime();
+}
+
+void World::RecordTimeDiff(std::string const& text)
+{
+    if (m_updateTimeCount != 1)
         return;
-    }
 
     uint32 thisTime = getMSTime();
     uint32 diff = getMSTimeDiff(m_currentTime, thisTime);
 
     if (diff > m_int_configs[CONFIG_MIN_LOG_UPDATE])
-    {
-        va_list ap;
-        char str[256];
-        va_start(ap, text);
-        vsnprintf(str, 256, text, ap);
-        va_end(ap);
-        TC_LOG_INFO("misc", "Difftime %s: %u.", str, diff);
-    }
+        TC_LOG_INFO("misc", "Difftime %s: %u.", text.c_str(), diff);
 
     m_currentTime = thisTime;
 }
@@ -2149,7 +2145,7 @@ void World::Update(uint32 diff)
     }
 
     /// <li> Handle session updates when the timer has passed
-    RecordTimeDiff(NULL);
+    ResetTimeDiffRecord();
     UpdateSessions(diff);
     RecordTimeDiff("UpdateSessions");
 
@@ -2196,7 +2192,7 @@ void World::Update(uint32 diff)
 
     /// <li> Handle all other objects
     ///- Update objects when the timer has passed (maps, transport, creatures, ...)
-    RecordTimeDiff(NULL);
+    ResetTimeDiffRecord();
     sMapMgr->Update(diff);
     RecordTimeDiff("UpdateMapMgr");
 
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index f0cfcb37969..78243b19374 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -771,7 +771,8 @@ class World
         void LoadDBVersion();
         char const* GetDBVersion() const { return m_DBVersion.c_str(); }
 
-        void RecordTimeDiff(const char * text, ...);
+        void ResetTimeDiffRecord();
+        void RecordTimeDiff(std::string const& text);
 
         void LoadAutobroadcasts();
 
-- 
cgit v1.2.3