From a957f93532bfd2025fe20dd8929866c97b5e4df1 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 29 Dec 2014 01:09:07 +0100 Subject: Use printf-like format in JitRegister::Register The API is cleaner (no more magic default parameter) and more extensible like this. --- Source/Core/Common/StringUtil.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index cfd7b03577..b922704032 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -95,28 +95,30 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar std::string StringFromFormat(const char* format, ...) { va_list args; + va_start(args, format); + std::string res = StringFromFormatV(format, args); + va_end(args); + return std::move(res); +} + +std::string StringFromFormatV(const char* format, va_list args) +{ char *buf = nullptr; #ifdef _WIN32 - int required = 0; - - va_start(args, format); - required = _vscprintf(format, args); + int required = _vscprintf(format, args); buf = new char[required + 1]; CharArrayFromFormatV(buf, required + 1, format, args); - va_end(args); std::string temp = buf; delete[] buf; #else - va_start(args, format); if (vasprintf(&buf, format, args) < 0) ERROR_LOG(COMMON, "Unable to allocate memory for string"); - va_end(args); std::string temp = buf; free(buf); #endif - return temp; + return std::move(temp); } // For Debugging. Read out an u8 array. -- cgit v1.2.3