mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-09-12 09:58:03 +02:00
Uptime: code refactor
This commit is contained in:
@@ -5,6 +5,6 @@
|
||||
|
||||
#include "fastfetch.h"
|
||||
|
||||
uint64_t ffDetectUptime();
|
||||
const char* ffDetectUptime(uint64_t* result);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
#include <sysinfoapi.h>
|
||||
|
||||
uint64_t ffDetectUptime()
|
||||
const char* ffDetectUptime(uint64_t* result)
|
||||
{
|
||||
return GetTickCount64() / 1000;
|
||||
*result = GetTickCount64() / 1000;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user