From d5cd9b7b0dc3a82630cd90e4c93a128790a8c4a6 Mon Sep 17 00:00:00 2001 From: cathery Date: Thu, 6 Feb 2020 02:38:34 +0300 Subject: [PATCH] replace time posix functions with time service functions --- source/Sysmodule/source/{log.c => log.cpp} | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) rename source/Sysmodule/source/{log.c => log.cpp} (55%) diff --git a/source/Sysmodule/source/log.c b/source/Sysmodule/source/log.cpp similarity index 55% rename from source/Sysmodule/source/log.c rename to source/Sysmodule/source/log.cpp index b995d0e..1db5671 100644 --- a/source/Sysmodule/source/log.c +++ b/source/Sysmodule/source/log.cpp @@ -1,9 +1,7 @@ #include "switch.h" #include "log.h" #include "configFile.h" -#include -#include -#include +#include static Mutex g_PrintMutex = 0; @@ -11,23 +9,15 @@ void WriteToLog(const char *fmt, ...) { mutexLock(&g_PrintMutex); -#ifdef __APPLET__ - va_list va; - va_start(va, fmt); - vprintf(fmt, va); - printf("\n"); - va_end(va); - -#else - - time_t unixTime = time(NULL); - struct tm tStruct; - localtime_r(&unixTime, &tStruct); + u64 ts; + TimeCalendarTime caltime; + timeGetCurrentTime(TimeType_LocalSystemClock, &ts); + timeToCalendarTimeWithMyRule(ts, &caltime, nullptr); FILE *fp = fopen(CONFIG_PATH "log.txt", "a"); //Print time - fprintf(fp, "%04i-%02i-%02i %02i:%02i:%02i: ", (tStruct.tm_year + 1900), tStruct.tm_mon, tStruct.tm_mday, tStruct.tm_hour, tStruct.tm_min, tStruct.tm_sec); + fprintf(fp, "%04i-%02i-%02i %02i:%02i:%02i: ", caltime.year, caltime.month, caltime.day, caltime.hour, caltime.minute, caltime.second); //Print the actual text va_list va; @@ -37,7 +27,6 @@ void WriteToLog(const char *fmt, ...) fprintf(fp, "\n"); fclose(fp); -#endif mutexUnlock(&g_PrintMutex); }