From 51bc06f60ba78772524bf152d097a5e1efb97e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Tue, 25 Apr 2023 19:39:35 +0800
Subject: [PATCH] Uptime: code refactor

---
 src/detection/uptime/uptime.h         |  2 +-
 src/detection/uptime/uptime_bsd.c     | 10 ++++++----
 src/detection/uptime/uptime_linux.c   |  7 ++++---
 src/detection/uptime/uptime_windows.c |  5 +++--
 src/modules/uptime.c                  |  8 +++++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/detection/uptime/uptime.h b/src/detection/uptime/uptime.h
index 6a032b47c..447b13d5b 100644
--- a/src/detection/uptime/uptime.h
+++ b/src/detection/uptime/uptime.h
@@ -5,6 +5,6 @@
 
 #include "fastfetch.h"
 
-uint64_t ffDetectUptime();
+const char* ffDetectUptime(uint64_t* result);
 
 #endif
diff --git a/src/detection/uptime/uptime_bsd.c b/src/detection/uptime/uptime_bsd.c
index 375065c35..4e3a707c6 100644
--- a/src/detection/uptime/uptime_bsd.c
+++ b/src/detection/uptime/uptime_bsd.c
@@ -4,7 +4,7 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 
-uint64_t ffDetectUptime()
+const char* ffDetectUptime(uint64_t* result)
 {
     struct timeval bootTime;
     size_t bootTimeSize = sizeof(bootTime);
@@ -12,8 +12,10 @@ uint64_t ffDetectUptime()
         (int[]) {CTL_KERN, KERN_BOOTTIME}, 2,
         &bootTime, &bootTimeSize,
         NULL, 0
-    ) == 0)
-        return (uint64_t) difftime(time(NULL), bootTime.tv_sec);
+    ) != 0)
+        return "sysctl({CTL_KERN, KERN_BOOTTIME}) failed";
 
-    return 0;
+    *result = (uint64_t) difftime(time(NULL), bootTime.tv_sec);
+
+    return NULL;
 }
diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c
index cf4860771..6ba4a51a1 100644
--- a/src/detection/uptime/uptime_linux.c
+++ b/src/detection/uptime/uptime_linux.c
@@ -2,10 +2,11 @@
 
 #include <sys/sysinfo.h>
 
-uint64_t ffDetectUptime()
+const char* ffDetectUptime(uint64_t* result)
 {
     struct sysinfo info;
     if(sysinfo(&info) != 0)
-        return 0;
-    return (uint32_t) info.uptime;
+        return "sysinfo() failed";
+    *result = info.uptime;
+    return NULL;
 }
diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c
index 657af033b..55053ab24 100644
--- a/src/detection/uptime/uptime_windows.c
+++ b/src/detection/uptime/uptime_windows.c
@@ -2,7 +2,8 @@
 
 #include <sysinfoapi.h>
 
-uint64_t ffDetectUptime()
+const char* ffDetectUptime(uint64_t* result)
 {
-    return GetTickCount64() / 1000;
+    *result = GetTickCount64() / 1000;
+    return NULL;
 }
diff --git a/src/modules/uptime.c b/src/modules/uptime.c
index 48d2b4f4a..6e1c81209 100644
--- a/src/modules/uptime.c
+++ b/src/modules/uptime.c
@@ -7,11 +7,13 @@
 
 void ffPrintUptime(FFinstance* instance)
 {
-    uint64_t uptime = ffDetectUptime();
+    uint64_t uptime;
 
-    if(uptime == 0)
+    const char* error = ffDetectUptime(&uptime);
+
+    if(error)
     {
-        ffPrintError(instance, FF_UPTIME_MODULE_NAME, 0, &instance->config.uptime, "Uptime could't be detected");
+        ffPrintError(instance, FF_UPTIME_MODULE_NAME, 0, &instance->config.uptime, "%s", error);
         return;
     }