fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-04 04:04:17 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

JsonConfig: simplify code

Browse Source
This commit is contained in:
李通洲
2023-03-15 16:54:50 +08:00
parent dca9ce4b2d
commit ff721218f5
32 changed files with 162 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/battery/battery.c
+1 -9
View File
@@ -4,7 +4,6 @@
#include "detection/battery/battery.h"
#include "modules/battery/battery.h"
#define FF_BATTERY_MODULE_NAME "Battery"
#define FF_BATTERY_NUM_FORMAT_ARGS 5
static void printBattery(FFinstance* instance, FFBatteryOptions* options, BatteryResult* result, uint8_t index)
@@ -148,11 +147,8 @@ void ffDestroyBatteryOptions(FFBatteryOptions* options)
}
#ifdef FF_HAVE_JSONC
bool ffParseBatteryJsonObject(FFinstance* instance, const char* type, json_object* module)
void ffParseBatteryJsonObject(FFinstance* instance, json_object* module)
{
if (strcasecmp(type, FF_BATTERY_MODULE_NAME) != 0)
return false;
FFBatteryOptions __attribute__((__cleanup__(ffDestroyBatteryOptions))) options;
ffInitBatteryOptions(&options);
@@ -160,9 +156,6 @@ bool ffParseBatteryJsonObject(FFinstance* instance, const char* type, json_objec
{
json_object_object_foreach(module, key, val)
{
if (strcasecmp(key, "type") == 0)
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
@@ -185,6 +178,5 @@ bool ffParseBatteryJsonObject(FFinstance* instance, const char* type, json_objec
}
ffPrintBattery(instance, &options);
return true;
}
#endif
src/modules/battery/battery.h
+3 -1
View File
@@ -2,6 +2,8 @@
#include "fastfetch.h"
#define FF_BATTERY_MODULE_NAME "Battery"
void ffPrintBattery(FFinstance* instance, FFBatteryOptions* options);
void ffInitBatteryOptions(FFBatteryOptions* options);
@@ -10,5 +12,5 @@ void ffDestroyBatteryOptions(FFBatteryOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
bool ffParseBatteryJsonObject(FFinstance* instance, const char* type, json_object* module);
void ffParseBatteryJsonObject(FFinstance* instance, json_object* module);
#endif