diff options
Diffstat (limited to 'Source/Core/Common/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
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 |
