From e59f770ccbf61f012d148a390e7f76775ab2a02e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 9 Feb 2014 16:12:59 +0100 Subject: Revert "Merge pull request #49 from Parlane/sprintf_tidy" Change broke the build on Debian stable. This reverts commit 28755439b36ac8e875d764da5db31ad693459ace, reversing changes made to 64e01ec763d21915e7166e625f8a3e85b46fbcbb. --- Source/Core/Common/Timer.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Source/Core/Common/Timer.cpp') diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 91a2a2d3ad..267755fb17 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -167,23 +167,27 @@ u64 Timer::GetLocalTimeSinceJan1970() std::string Timer::GetTimeFormatted() { time_t sysTime; + struct tm * gmTime; + char formattedTime[13]; + char tmp[13]; + time(&sysTime); - - struct tm * gmTime = localtime(&sysTime); + gmTime = localtime(&sysTime); - char tmp[13]; strftime(tmp, 6, "%M:%S", gmTime); // Now tack on the milliseconds #ifdef _WIN32 struct timeb tp; (void)::ftime(&tp); - return StringFromFormat("%s:%03i", tmp, tp.millitm); + sprintf(formattedTime, "%s:%03i", tmp, tp.millitm); #else struct timeval t; (void)gettimeofday(&t, NULL); - return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000)); + sprintf(formattedTime, "%s:%03d", tmp, (int)(t.tv_usec / 1000)); #endif + + return std::string(formattedTime); } // Returns a timestamp with decimals for precise time comparisons -- cgit v1.2.3