JsonConfig: code refactor

This commit is contained in:
李通洲
2023-10-25 09:13:04 +08:00
parent fa02217ff4
commit 4e018dbf26
5 changed files with 12 additions and 20 deletions
+3 -9
View File
@@ -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);
+3 -3
View File
@@ -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,