From bfd1390c1035031a4216f8389dc23b10d70d5e10 Mon Sep 17 00:00:00 2001 From: boxa Date: Wed, 3 Jan 2018 22:23:01 +0100 Subject: [PATCH] Fix Travis GCC warning: zero-length gnu_printf format string [-Wformat-zero-length] (based on cmangos/mangos-wotlk@3cfee4f23) Signed-off-by: Xfurry --- src/game/AI/ScriptDevAI/ScriptDevAIMgr.cpp | 4 ++-- src/game/AI/ScriptDevAI/system/system.cpp | 6 +++--- src/shared/Log.cpp | 5 +++++ src/shared/Log.h | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/game/AI/ScriptDevAI/ScriptDevAIMgr.cpp b/src/game/AI/ScriptDevAI/ScriptDevAIMgr.cpp index cfae4a3502..1a4710059d 100644 --- a/src/game/AI/ScriptDevAI/ScriptDevAIMgr.cpp +++ b/src/game/AI/ScriptDevAI/ScriptDevAIMgr.cpp @@ -463,7 +463,7 @@ void ScriptDevAIMgr::Initialize() outstring_log("SD2: Loading C++ scripts"); BarGoLink bar(1); bar.step(); - outstring_log(""); + outstring_log(); // Resize script ids to needed amount of assigned ScriptNames (from core) m_scripts.resize(GetScriptIdsCount(), nullptr); @@ -481,7 +481,7 @@ void ScriptDevAIMgr::Initialize() outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts); #else - outstring_log(""); + outstring_log(); outstring_log(">> ScriptDev is disabled!"); #endif } diff --git a/src/game/AI/ScriptDevAI/system/system.cpp b/src/game/AI/ScriptDevAI/system/system.cpp index 2d60c97d7b..472355d28e 100644 --- a/src/game/AI/ScriptDevAI/system/system.cpp +++ b/src/game/AI/ScriptDevAI/system/system.cpp @@ -42,7 +42,7 @@ void SystemMgr::LoadVersion() strSD2Version.append("ScriptDev2 "); outstring_log("Loading %s", strSD2Version.c_str()); - outstring_log(""); + outstring_log(); } void SystemMgr::LoadScriptTexts() @@ -111,14 +111,14 @@ void SystemMgr::LoadScriptWaypoints() delete pResult; - outstring_log(""); + outstring_log(); outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount); } else { BarGoLink bar(1); bar.step(); - outstring_log(""); + outstring_log(); outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty."); } } diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index 2af5c5df53..4c263ad6d1 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -986,6 +986,11 @@ void Log::setScriptLibraryErrorFile(char const* fname, char const* libName) scriptErrLogFile = fopen(fileName.c_str(), "a"); } +void outstring_log() +{ + sLog.outString(); +} + void outstring_log(const char* str, ...) { if (!str) diff --git a/src/shared/Log.h b/src/shared/Log.h index 42bc749cc1..8f9c7e76b2 100644 --- a/src/shared/Log.h +++ b/src/shared/Log.h @@ -269,6 +269,7 @@ class Log : public MaNGOS::Singleton