diff --git a/src/common/commandoption.c b/src/common/commandoption.c index 7b0402b51..80ddcb923 100644 --- a/src/common/commandoption.c +++ b/src/common/commandoption.c @@ -15,8 +15,8 @@ static inline yyjson_mut_val* genJson(FFModuleBaseInfo* baseInfo) yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root); yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name); - if (baseInfo->generateJson) - baseInfo->generateJson(baseInfo, doc, module); + if (baseInfo->generateJsonResult) + baseInfo->generateJsonResult(baseInfo, doc, module); else yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format"); return module; diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 26dd884d6..09610cd0e 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -77,8 +77,8 @@ static inline yyjson_mut_val* genJson(FFModuleBaseInfo* baseInfo) yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root); yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name); - if (baseInfo->generateJson) - baseInfo->generateJson(baseInfo, doc, module); + if (baseInfo->generateJsonResult) + baseInfo->generateJsonResult(baseInfo, doc, module); else yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format"); return module; diff --git a/src/common/option.h b/src/common/option.h index 47e96585c..3207e576d 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -17,7 +17,7 @@ typedef struct FFModuleBaseInfo bool (*parseCommandOptions)(void* options, const char* key, const char* value); void (*parseJsonObject)(void* options, struct yyjson_val *module); void (*printModule)(void* options); - void (*generateJson)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module); + void (*generateJsonResult)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module); void (*printHelpFormat)(void); } FFModuleBaseInfo; @@ -27,7 +27,7 @@ static inline void ffOptionInitModuleBaseInfo( void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value) void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module) void* printModule, // void (*const printModule)(void* options) - void* generateJson, // void (*const generateJson)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj) + void* generateJsonResult, // void (*const generateJsonResult)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj) void (*printHelpFormat)(void) ) { @@ -35,7 +35,7 @@ static inline void ffOptionInitModuleBaseInfo( baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions; baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject; baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule; - baseInfo->generateJson = (__typeof__(baseInfo->generateJson)) generateJson; + baseInfo->generateJsonResult = (__typeof__(baseInfo->generateJsonResult)) generateJsonResult; baseInfo->printHelpFormat = printHelpFormat; }