From b96acad0cab96002d43d55a692d426f20b169072 Mon Sep 17 00:00:00 2001
From: Madthijs <games@madthijs.com>
Date: Tue, 4 May 2021 18:11:03 +0200
Subject: [PATCH] logging fix

---
 .../xcshareddata/xcschemes/AerofoilMac.xcscheme  |  6 ++++++
 AerofoilX/GpFileSystem_X.cpp                     |  2 --
 AerofoilX/GpLogDriver_X.cpp                      |  9 +++++++--
 GpCommon/IGpLogDriver.h                          | 16 ----------------
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme b/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme
index e5a33fa..e8c8de1 100644
--- a/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme
+++ b/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme
@@ -50,6 +50,12 @@
             ReferencedContainer = "container:AerofoilMac.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-diagnostics"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/AerofoilX/GpFileSystem_X.cpp b/AerofoilX/GpFileSystem_X.cpp
index e6a3c5d..592a67e 100644
--- a/AerofoilX/GpFileSystem_X.cpp
+++ b/AerofoilX/GpFileSystem_X.cpp
@@ -235,8 +235,6 @@ void GpFileSystem_X::Init()
 		int created = mkdir(prefsPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 	}
 	SDL_free(prefsDir);
-
-    printf("Base path %s \n", m_basePath.c_str());
 }
 
 bool GpFileSystem_X::FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path)
diff --git a/AerofoilX/GpLogDriver_X.cpp b/AerofoilX/GpLogDriver_X.cpp
index 5f0b8c6..b2c48fd 100644
--- a/AerofoilX/GpLogDriver_X.cpp
+++ b/AerofoilX/GpLogDriver_X.cpp
@@ -20,7 +20,7 @@ void GpLogDriver_X::Init()
 
 void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args)
 {
-	size_t fmtSize = 0;
+    size_t fmtSize = 0;
 	bool hasFormatting = false;
 	for (const char *fmtCheck = fmt; *fmtCheck; fmtCheck++)
 	{
@@ -64,6 +64,10 @@ void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args)
 	}
 	else
 	{
+        //a copy is needed if using va_list multiple times (otherwise unexpected output)
+        va_list args_copy;
+        va_copy(args_copy, args);
+
 		int formattedSize = vsnprintf(nullptr, 0, fmt, args);
 		if (formattedSize <= 0)
 			return;
@@ -72,7 +76,8 @@ void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args)
 		if (!charBuff)
 			return;
 
-		vsnprintf(charBuff, formattedSize + 1, fmt, args);
+		vsnprintf(charBuff, formattedSize + 1, fmt, args_copy);
+        va_end(args_copy);
 
 		if (m_stream)
 			m_stream->Write(charBuff, formattedSize);
diff --git a/GpCommon/IGpLogDriver.h b/GpCommon/IGpLogDriver.h
index 183571b..f70d7b8 100644
--- a/GpCommon/IGpLogDriver.h
+++ b/GpCommon/IGpLogDriver.h
@@ -15,24 +15,9 @@ struct IGpLogDriver
 	virtual void VPrintf(Category category, const char *fmt, va_list args) = 0;
 	virtual void Shutdown() = 0;
 
-	#ifdef __MACOS__
-	template <typename C, typename F, typename... T>
-	void Printf(C category, F *fmt, T... t);
-	#else
 	void Printf(Category category, const char *fmt, ...);
-	#endif
-	
 };
 
-//this is temp, but args lose their types for some reason, garbling output
-#ifdef __MACOS__
-template <typename C, typename F, typename... T>
-inline void IGpLogDriver::Printf(C category, F *fmt, T... t)
-{
-	printf(fmt, t...);
-	printf("\n");
-}
-#else
 inline void IGpLogDriver::Printf(Category category, const char *fmt, ...)
 {
 	va_list args;
@@ -40,4 +25,3 @@ inline void IGpLogDriver::Printf(Category category, const char *fmt, ...)
 	this->VPrintf(category, fmt, args);
 	va_end(args);
 }
-#endif