fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-28 15:53:51 +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/display/display.c
+1 -9
View File
@@ -3,7 +3,6 @@
#include "detection/displayserver/displayserver.h"
#include "modules/display/display.h"
#define FF_DISPLAY_MODULE_NAME "Display"
#define FF_DISPLAY_NUM_FORMAT_ARGS 7
void ffPrintDisplay(FFinstance* instance, FFDisplayOptions* options)
@@ -159,11 +158,8 @@ void ffDestroyDisplayOptions(FFDisplayOptions* options)
}
#ifdef FF_HAVE_JSONC
bool ffParseDisplayJsonObject(FFinstance* instance, const char* type, json_object* module)
void ffParseDisplayJsonObject(FFinstance* instance, json_object* module)
{
if (strcasecmp(type, FF_DISPLAY_MODULE_NAME) != 0)
return false;
FFDisplayOptions __attribute__((__cleanup__(ffDestroyDisplayOptions))) options;
ffInitDisplayOptions(&options);
@@ -171,9 +167,6 @@ bool ffParseDisplayJsonObject(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;
@@ -210,6 +203,5 @@ bool ffParseDisplayJsonObject(FFinstance* instance, const char* type, json_objec
}
ffPrintDisplay(instance, &options);
return true;
}
#endif
src/modules/display/display.h
+3 -1
View File
@@ -2,6 +2,8 @@
#include "fastfetch.h"
#define FF_DISPLAY_MODULE_NAME "Display"
void ffPrintDisplay(FFinstance* instance, FFDisplayOptions* options);
void ffInitDisplayOptions(FFDisplayOptions* options);
bool ffParseDisplayCommandOptions(FFDisplayOptions* options, const char* key, const char* value);
@@ -9,5 +11,5 @@ void ffDestroyDisplayOptions(FFDisplayOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
bool ffParseDisplayJsonObject(FFinstance* instance, const char* type, json_object* module);
void ffParseDisplayJsonObject(FFinstance* instance, json_object* module);
#endif