update

bupticybee · May 29, 2024 · a1aab79 · a1aab79
1 parent 44d7c62
commit a1aab79
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/include/tools/logger.h b/include/tools/logger.h
@@ -16,9 +16,8 @@ class Logger {
     Logger(bool cmd, const char *path, const char *mode = "w", bool timestamp = false, bool new_line = true, int period = 10)
         :cmd(cmd), timestamp(timestamp), new_line(new_line), period(period) {
         if(path) {
-            errno_t err = fopen_s(&file, path, mode);
-            if(err) printf("%d\n", err);
-            if(!file) printf("create file %s failed\n", path);
+            file = fopen(path, mode);
+            if(!file) printf("failed to create file %s\n", path);
         }
     }
     virtual ~Logger() {

diff --git a/mainwindow.h b/mainwindow.h
@@ -20,7 +20,7 @@ class QLogger : public Logger {
     QLogger(const char *path, const char *mode = "w", bool timestamp = false, int period = 10):Logger(false, path, mode, timestamp, true, period) {}
     virtual void log(const char *format, ...) {
         if(timestamp) log_time();
-        va_list args = nullptr;
+        va_list args;
         va_start(args, format);
         if(file) {
             vfprintf(file, format, args);
@@ -29,6 +29,10 @@ class QLogger : public Logger {
                 fflush(file);
             }
             if(new_line) fprintf(file, "\n");
+#ifdef __GNUC__
+            va_end(args);
+            va_start(args, format);
+#endif
         }
         // qDebug().noquote() << QString::vasprintf(QObject::tr(format).toLocal8Bit(), args);
         qDebug().noquote() << QString::vasprintf(QObject::tr(format).toStdString().c_str(), args);

diff --git a/src/tools/logger.cpp b/src/tools/logger.cpp
@@ -8,9 +8,13 @@ void get_localtime(char *buf, size_t n, const char *format) {
     // time(&now);
     int ms = duration_cast<milliseconds>(tp.time_since_epoch()).count() - now * 1000;
     tm tm_now;
+#ifdef _MSC_VER
     localtime_s(&tm_now, &now);
+#else
+    localtime_r(&now, &tm_now);
+#endif
     // strftime(buf, n, format, &tm_now);
-    sprintf_s(buf, n, format, tm_now.tm_year+1900, tm_now.tm_mon+1, tm_now.tm_mday,
+    snprintf(buf, n, format, tm_now.tm_year+1900, tm_now.tm_mon+1, tm_now.tm_mday,
             tm_now.tm_hour, tm_now.tm_min, tm_now.tm_sec, ms);
 }
 
@@ -22,7 +26,7 @@ string get_localtime() {
 
 void Logger::log(const char *format, ...) {
     if(timestamp) log_time();
-    va_list args = nullptr;
+    va_list args;
     va_start(args, format);
     if(file) {
         vfprintf(file, format, args);
@@ -31,6 +35,12 @@ void Logger::log(const char *format, ...) {
             fflush(file);
         }
         if(new_line) fprintf(file, "\n");
+#ifdef __GNUC__
+        if(cmd) {
+            va_end(args);
+            va_start(args, format);
+        }
+#endif
     }
     if(cmd) {
         vprintf(format, args);