From da4078c70775d5cb893997542821c96f476e553b Mon Sep 17 00:00:00 2001 From: Ben Payne Date: Wed, 4 Mar 2015 16:00:02 -0500 Subject: [PATCH] Fix passing of non-primitive types to varargs functions --- Engine/source/platformWin32/winFileio.cpp | 6 +++--- Engine/source/platformWin32/winMath.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/platformWin32/winFileio.cpp b/Engine/source/platformWin32/winFileio.cpp index 36900cd15..73bbc5c29 100644 --- a/Engine/source/platformWin32/winFileio.cpp +++ b/Engine/source/platformWin32/winFileio.cpp @@ -1409,9 +1409,9 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve if( ( subPath && ( dStrncmp( subPath, "", 1 ) != 0 ) )) { if( subTrail == '/' ) - dSprintf(search, search.size, "%s%s", subPath, fileName); + dSprintf(search, search.size, "%s%s", subPath, fileName.ptr); else - dSprintf(search, search.size, "%s/%s", subPath, fileName); + dSprintf(search, search.size, "%s/%s", subPath, fileName.ptr); char* child = search; if( currentDepth < recurseDepth || recurseDepth == -1 ) @@ -1425,7 +1425,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve child = fileName; else { - dSprintf(search, search.size, "/%s", fileName); + dSprintf(search, search.size, "/%s", fileName.ptr); child = search; } diff --git a/Engine/source/platformWin32/winMath.cpp b/Engine/source/platformWin32/winMath.cpp index fb7a73054..50e5fdbc6 100644 --- a/Engine/source/platformWin32/winMath.cpp +++ b/Engine/source/platformWin32/winMath.cpp @@ -79,7 +79,7 @@ ConsoleFunction( mathInit, void, 1, 10, "( ... )" properties |= CPU_PROP_SSE; continue; } - Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", *argv); + Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", argv->getStringValue()); } Math::init(properties); }