Global: make FFinstance instance a global variable

As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
+1 -1
View File
@@ -17,6 +17,6 @@ typedef struct BatteryResult
double temperature;
} BatteryResult;
const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results);
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results);
#endif
+1 -1
View File
@@ -7,7 +7,7 @@
#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
#define FF_TERMUX_API_PARAM "BatteryStatus"
const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
{
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+2 -2
View File
@@ -5,7 +5,7 @@
#include <IOKit/IOKitLib.h>
static double detectBatteryTemp()
static double detectBatteryTemp(void)
{
FF_LIST_AUTO_DESTROY temps = ffListCreate(sizeof(FFTempValue));
@@ -27,7 +27,7 @@ static double detectBatteryTemp()
return result;
}
const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
{
CFMutableDictionaryRef matchDict = IOServiceMatching("AppleSmartBattery");
if (matchDict == NULL)
+1 -1
View File
@@ -7,7 +7,7 @@
#include <sys/fcntl.h>
#include <unistd.h>
const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
{
//https://www.freebsd.org/cgi/man.cgi?acpi_battery(4)
//https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/panel-plugin/libacpi.c
+1 -1
View File
@@ -68,7 +68,7 @@ static void parseBattery(FFstrbuf* dir, FFlist* results)
result->temperature = FF_BATTERY_TEMP_UNSET;
}
const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
{
FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
+2 -2
View File
@@ -1,8 +1,8 @@
#include "fastfetch.h"
#include "battery.h"
const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
{
FF_UNUSED(instance, options, results)
FF_UNUSED(options, results)
return "Not supported on this platform";
}
+2 -2
View File
@@ -30,9 +30,9 @@ static inline void wrapSetupDiDestroyDeviceInfoList(HDEVINFO* hdev)
SetupDiDestroyDeviceInfoList(*hdev);
}
const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results)
const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
{
if(instance->config.allowSlowOperations)
if(instance.config.allowSlowOperations)
{
//https://learn.microsoft.com/en-us/windows/win32/power/enumerating-battery-devices
HDEVINFO hdev __attribute__((__cleanup__(wrapSetupDiDestroyDeviceInfoList))) =