fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-10 07:00:08 +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/brightness/brightness.c
+1 -9
View File
@@ -3,7 +3,6 @@
#include "detection/brightness/brightness.h"
#include "modules/brightness/brightness.h"
#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
#define FF_BRIGHTNESS_NUM_FORMAT_ARGS 2
void ffPrintBrightness(FFinstance* instance, FFBrightnessOptions* options)
@@ -80,11 +79,8 @@ void ffDestroyBrightnessOptions(FFBrightnessOptions* options)
}
#ifdef FF_HAVE_JSONC
bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, json_object* module)
void ffParseBrightnessJsonObject(FFinstance* instance, json_object* module)
{
if (strcasecmp(type, FF_BRIGHTNESS_MODULE_NAME) != 0)
return false;
FFBrightnessOptions __attribute__((__cleanup__(ffDestroyBrightnessOptions))) options;
ffInitBrightnessOptions(&options);
@@ -92,9 +88,6 @@ bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, json_ob
{
json_object_object_foreach(module, key, val)
{
if (strcasecmp(key, "type") == 0)
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
@@ -103,6 +96,5 @@ bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, json_ob
}
ffPrintBrightness(instance, &options);
return true;
}
#endif
src/modules/brightness/brightness.h
+3 -1
View File
@@ -2,6 +2,8 @@
#include "fastfetch.h"
#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
void ffPrintBrightness(FFinstance* instance, FFBrightnessOptions* options);
void ffInitBrightnessOptions(FFBrightnessOptions* options);
bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value);
@@ -9,5 +11,5 @@ void ffDestroyBrightnessOptions(FFBrightnessOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, json_object* module);
void ffParseBrightnessJsonObject(FFinstance* instance, json_object* module);
#endif