fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 08:13:44 +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/datetime/datetime.c
+1 -9
View File
@@ -3,7 +3,6 @@
#include "detection/datetime/datetime.h"
#include "modules/datetime/datetime.h"
#define FF_DATETIME_MODULE_NAME "DateTime"
#define FF_DATETIME_DISPLAY_NAME "Date & Time"
#define FF_DATETIME_NUM_FORMAT_ARGS 20
@@ -71,11 +70,8 @@ void ffDestroyDateTimeOptions(FFDateTimeOptions* options)
}
#ifdef FF_HAVE_JSONC
bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, json_object* module)
void ffParseDateTimeJsonObject(FFinstance* instance, json_object* module)
{
if (strcasecmp(type, FF_DATETIME_MODULE_NAME) != 0)
return false;
FFDateTimeOptions __attribute__((__cleanup__(ffDestroyDateTimeOptions))) options;
ffInitDateTimeOptions(&options);
@@ -83,9 +79,6 @@ bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, json_obje
{
json_object_object_foreach(module, key, val)
{
if (strcasecmp(key, "type") == 0)
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
@@ -94,6 +87,5 @@ bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, json_obje
}
ffPrintDateTime(instance, &options);
return true;
}
#endif
src/modules/datetime/datetime.h
+3 -1
View File
@@ -2,6 +2,8 @@
#include "fastfetch.h"
#define FF_DATETIME_MODULE_NAME "DateTime"
void ffPrintDateTime(FFinstance* instance, FFDateTimeOptions* options);
void ffInitDateTimeOptions(FFDateTimeOptions* options);
bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value);
@@ -9,5 +11,5 @@ void ffDestroyDateTimeOptions(FFDateTimeOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
bool ffParseDateTimeJsonObject(FFinstance* instance, const char* type, json_object* module);
void ffParseDateTimeJsonObject(FFinstance* instance, json_object* module);
#endif