JsonConfig: code refactor

src/common/jsonconfig.c

@@ -227,10 +227,8 @@ static const char* printJsonConfig(bool prepare)
     return NULL;
 }
 
-const char* ffParseGeneralJsonConfig(void)
+const char* ffParseGeneralJsonConfig(FFconfig* config)
 {
-    FFconfig* config = &instance.config;
-
     yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
     assert(root);
 
@@ -282,10 +280,8 @@ const char* ffParseGeneralJsonConfig(void)
     return NULL;
 }
 
-const char* ffParseDisplayJsonConfig(void)
+const char* ffParseDisplayJsonConfig(FFconfig* config)
 {
-    FFconfig* config = &instance.config;
-
     yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
     assert(root);
 
@@ -416,10 +412,8 @@ const char* ffParseDisplayJsonConfig(void)
     return NULL;
 }
 
-const char* ffParseLibraryJsonConfig(void)
+const char* ffParseLibraryJsonConfig(FFconfig* config)
 {
-    FFconfig* config = &instance.config;
-
     yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
     assert(root);
 

src/common/jsonconfig.h

@@ -5,9 +5,9 @@
 bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* moduleArgs);
 const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[]);
 void ffPrintJsonConfig(bool prepare);
-const char* ffParseGeneralJsonConfig(void);
-const char* ffParseDisplayJsonConfig(void);
-const char* ffParseLibraryJsonConfig(void);
+const char* ffParseGeneralJsonConfig(FFconfig* config);
+const char* ffParseDisplayJsonConfig(FFconfig* config);
+const char* ffParseLibraryJsonConfig(FFconfig* config);
 void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* defaultModuleArgs, FFModuleArgs* moduleArgs);
 
 yyjson_api_inline bool yyjson_mut_obj_add_strbuf(yyjson_mut_doc *doc,

src/fastfetch.c

@@ -802,10 +802,10 @@ static void ffRun(FFdata* data)
         const char* error = NULL;
 
         if (
-            (error = ffParseLogoJsonConfig()) ||
-            (error = ffParseGeneralJsonConfig()) ||
-            (error = ffParseDisplayJsonConfig()) ||
-            (error = ffParseLibraryJsonConfig()) ||
+            (error = ffParseLogoJsonConfig(&instance.config.logo)) ||
+            (error = ffParseGeneralJsonConfig(&instance.config)) ||
+            (error = ffParseDisplayJsonConfig(&instance.config)) ||
+            (error = ffParseLibraryJsonConfig(&instance.config)) ||
             false
         ) {
             fputs(error, stderr);

src/logo/logo.h

@@ -36,6 +36,6 @@ bool ffLogoPrintImageIfExists(FFLogoType type, bool printError);
 void ffInitLogoOptions(FFLogoOptions* options);
 bool ffParseLogoCommandOptions(FFLogoOptions* options, const char* key, const char* value);
 void ffDestroyLogoOptions(FFLogoOptions* options);
-const char* ffParseLogoJsonConfig();
+const char* ffParseLogoJsonConfig(FFLogoOptions* options);
 
 #endif

src/logo/option.c

@@ -211,10 +211,8 @@ void ffDestroyLogoOptions(FFLogoOptions* options)
         ffStrbufDestroy(&options->colors[i]);
 }
 
-const char* ffParseLogoJsonConfig(void)
+const char* ffParseLogoJsonConfig(FFLogoOptions* options)
 {
-    FFLogoOptions* options = &instance.config.logo;
-
     yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
     assert(root);