From 5a372882fa5d6a0de18caa7d7916faca57bc6f42 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 26 Dec 2023 16:13:15 +0800 Subject: [PATCH] Battery (Linux): tidy --- src/detection/battery/battery_linux.c | 12 ++---------- src/modules/battery/battery.c | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index 49daded72..113c8949c 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -101,16 +101,8 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results) { FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64); - - if(options->dir.length > 0) - { - ffStrbufAppend(&baseDir, &options->dir); - ffStrbufEnsureEndsWithC(&baseDir, '/'); - } - else - { - ffStrbufAppendS(&baseDir, "/sys/class/power_supply/"); - } + ffStrbufAppend(&baseDir, &options->dir); + ffStrbufEnsureEndsWithC(&baseDir, '/'); uint32_t baseDirLength = baseDir.length; diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index c73897491..0946ad0c0 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -258,7 +258,7 @@ void ffInitBatteryOptions(FFBatteryOptions* options) options->temp = false; #ifdef __linux__ - ffStrbufInit(&options->dir); + ffStrbufInitStatic(&options->dir, "/sys/class/power_supply/"); #elif defined(_WIN32) options->useSetupApi = false; #endif