diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 09610cd0e..6e13334d5 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -115,7 +115,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) case 'd': case 'D': { if (ffStrEqualsIgnCase(type, FF_DISKIO_MODULE_NAME)) { - if (module) ffParseDiskIOJsonObject(&cfg->diskIo, module); + if (module) cfg->diskIo.moduleInfo.parseJsonObject(&cfg->diskIo, module); ffPrepareDiskIO(&cfg->diskIo); } break; @@ -123,7 +123,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) case 'n': case 'N': { if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME)) { - if (module) ffParseNetIOJsonObject(&cfg->netIo, module); + if (module) cfg->netIo.moduleInfo.parseJsonObject(&cfg->netIo, module); ffPrepareNetIO(&cfg->netIo); } break; @@ -131,7 +131,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) case 'p': case 'P': { if (ffStrEqualsIgnCase(type, FF_PUBLICIP_MODULE_NAME)) { - if (module) ffParsePublicIpJsonObject(&cfg->publicIP, module); + if (module) cfg->publicIP.moduleInfo.parseJsonObject(&cfg->publicIP, module); ffPreparePublicIp(&cfg->publicIP); } break; @@ -139,7 +139,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) case 'w': case 'W': { if (ffStrEqualsIgnCase(type, FF_WEATHER_MODULE_NAME)) { - if (module) ffParseWeatherJsonObject(&cfg->weather, module); + if (module) cfg->weather.moduleInfo.parseJsonObject(&cfg->weather, module); ffPrepareWeather(&cfg->weather); } break; diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index d3a42c4de..c48bc389b 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -101,17 +101,6 @@ void ffPrintBattery(FFBatteryOptions* options) } } -void ffInitBatteryOptions(FFBatteryOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BATTERY_MODULE_NAME, ffParseBatteryCommandOptions, ffParseBatteryJsonObject, ffPrintBattery, ffGenerateBatteryJsonResult, ffPrintBatteryHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - options->temp = false; - - #ifdef __linux__ - ffStrbufInit(&options->dir); - #endif -} - bool ffParseBatteryCommandOptions(FFBatteryOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_BATTERY_MODULE_NAME); @@ -136,15 +125,6 @@ bool ffParseBatteryCommandOptions(FFBatteryOptions* options, const char* key, co return false; } -void ffDestroyBatteryOptions(FFBatteryOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - - #ifdef __linux__ - ffStrbufDestroy(&options->dir); - #endif -} - void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -219,3 +199,23 @@ void ffPrintBatteryHelpFormat(void) "Battery status" }); } + +void ffInitBatteryOptions(FFBatteryOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BATTERY_MODULE_NAME, ffParseBatteryCommandOptions, ffParseBatteryJsonObject, ffPrintBattery, ffGenerateBatteryJsonResult, ffPrintBatteryHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + options->temp = false; + + #ifdef __linux__ + ffStrbufInit(&options->dir); + #endif +} + +void ffDestroyBatteryOptions(FFBatteryOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + + #ifdef __linux__ + ffStrbufDestroy(&options->dir); + #endif +} diff --git a/src/modules/battery/battery.h b/src/modules/battery/battery.h index 9cedbf56b..60d0f1c89 100644 --- a/src/modules/battery/battery.h +++ b/src/modules/battery/battery.h @@ -5,10 +5,5 @@ #define FF_BATTERY_MODULE_NAME "Battery" void ffPrintBattery(FFBatteryOptions* options); - void ffInitBatteryOptions(FFBatteryOptions* options); -bool ffParseBatteryCommandOptions(FFBatteryOptions* options, const char* key, const char* value); void ffDestroyBatteryOptions(FFBatteryOptions* options); -void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module); -void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintBatteryHelpFormat(void); diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index f77fdaa89..68f63e340 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -53,12 +53,6 @@ exit: ffStrbufDestroy(&bios.version); } -void ffInitBiosOptions(FFBiosOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BIOS_MODULE_NAME, ffParseBiosCommandOptions, ffParseBiosJsonObject, ffPrintBios, ffGenerateBiosJsonResult, ffPrintBiosHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseBiosCommandOptions(FFBiosOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_BIOS_MODULE_NAME); @@ -69,11 +63,6 @@ bool ffParseBiosCommandOptions(FFBiosOptions* options, const char* key, const ch return false; } -void ffDestroyBiosOptions(FFBiosOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -135,3 +124,14 @@ void ffPrintBiosHelpFormat(void) "bios version" }); } + +void ffInitBiosOptions(FFBiosOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BIOS_MODULE_NAME, ffParseBiosCommandOptions, ffParseBiosJsonObject, ffPrintBios, ffGenerateBiosJsonResult, ffPrintBiosHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyBiosOptions(FFBiosOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/bios/bios.h b/src/modules/bios/bios.h index cb11bac4f..6d99eccfd 100644 --- a/src/modules/bios/bios.h +++ b/src/modules/bios/bios.h @@ -6,8 +6,4 @@ void ffPrintBios(FFBiosOptions* options); void ffInitBiosOptions(FFBiosOptions* options); -bool ffParseBiosCommandOptions(FFBiosOptions* options, const char* key, const char* value); void ffDestroyBiosOptions(FFBiosOptions* options); -void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module); -void ffGenerateBiosJsonResult(FFBiosOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintBiosHelpFormat(void); diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 53cc7acbf..ae8e64779 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -73,13 +73,6 @@ void ffPrintBluetooth(FFBluetoothOptions* options) } } -void ffInitBluetoothOptions(FFBluetoothOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BLUETOOTH_MODULE_NAME, ffParseBluetoothCommandOptions, ffParseBluetoothJsonObject, ffPrintBluetooth, ffGenerateBluetoothJsonResult, ffPrintBluetoothHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - options->showDisconnected = false; -} - bool ffParseBluetoothCommandOptions(FFBluetoothOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_BLUETOOTH_MODULE_NAME); @@ -96,11 +89,6 @@ bool ffParseBluetoothCommandOptions(FFBluetoothOptions* options, const char* key return false; } -void ffDestroyBluetoothOptions(FFBluetoothOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -166,3 +154,15 @@ void ffPrintBluetoothHelpFormat(void) "Battery percentage" }); } + +void ffInitBluetoothOptions(FFBluetoothOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BLUETOOTH_MODULE_NAME, ffParseBluetoothCommandOptions, ffParseBluetoothJsonObject, ffPrintBluetooth, ffGenerateBluetoothJsonResult, ffPrintBluetoothHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + options->showDisconnected = false; +} + +void ffDestroyBluetoothOptions(FFBluetoothOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/bluetooth/bluetooth.h b/src/modules/bluetooth/bluetooth.h index 2156eedb9..20c3b6d81 100644 --- a/src/modules/bluetooth/bluetooth.h +++ b/src/modules/bluetooth/bluetooth.h @@ -6,8 +6,4 @@ void ffPrintBluetooth(FFBluetoothOptions* options); void ffInitBluetoothOptions(FFBluetoothOptions* options); -bool ffParseBluetoothCommandOptions(FFBluetoothOptions* options, const char* key, const char* value); void ffDestroyBluetoothOptions(FFBluetoothOptions* options); -void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module); -void ffGenerateBluetoothJsonResult(FFBluetoothOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintBluetoothHelpFormat(void); diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 34052cb42..e7664eb34 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -49,12 +49,6 @@ exit: ffStrbufDestroy(&result.version); } -void ffInitBoardOptions(FFBoardOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BOARD_MODULE_NAME, ffParseBoardCommandOptions, ffParseBoardJsonObject, ffPrintBoard, ffGenerateBoardJsonResult, ffPrintBoardHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_BOARD_MODULE_NAME); @@ -65,11 +59,6 @@ bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const return false; } -void ffDestroyBoardOptions(FFBoardOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -127,3 +116,14 @@ void ffPrintBoardHelpFormat(void) "board version" }); } + +void ffInitBoardOptions(FFBoardOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BOARD_MODULE_NAME, ffParseBoardCommandOptions, ffParseBoardJsonObject, ffPrintBoard, ffGenerateBoardJsonResult, ffPrintBoardHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyBoardOptions(FFBoardOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/board/board.h b/src/modules/board/board.h index 6beaf3a6d..7fdbffe95 100644 --- a/src/modules/board/board.h +++ b/src/modules/board/board.h @@ -6,8 +6,4 @@ void ffPrintBoard(FFBoardOptions* options); void ffInitBoardOptions(FFBoardOptions* options); -bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value); void ffDestroyBoardOptions(FFBoardOptions* options); -void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module); -void ffGenerateBoardJsonResult(FFBoardOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintBoardHelpFormat(void); diff --git a/src/modules/break/break.c b/src/modules/break/break.c index e52e357e6..5ec50ace9 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -7,22 +7,22 @@ void ffPrintBreak(FF_MAYBE_UNUSED FFBreakOptions* options) putchar('\n'); } -void ffInitBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BREAK_MODULE_NAME, ffParseBreakCommandOptions, ffParseBreakJsonObject, ffPrintBreak, NULL, NULL); -} - bool ffParseBreakCommandOptions(FF_MAYBE_UNUSED FFBreakOptions* options, FF_MAYBE_UNUSED const char* key, FF_MAYBE_UNUSED const char* value) { return false; } -void ffDestroyBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options) -{ -} - void ffParseBreakJsonObject(FF_MAYBE_UNUSED FFBreakOptions* options, FF_MAYBE_UNUSED yyjson_val* module) { ffPrintBreak(options); return; } + +void ffInitBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BREAK_MODULE_NAME, ffParseBreakCommandOptions, ffParseBreakJsonObject, ffPrintBreak, NULL, NULL); +} + +void ffDestroyBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options) +{ +} diff --git a/src/modules/break/break.h b/src/modules/break/break.h index 155548cf6..b651a503e 100644 --- a/src/modules/break/break.h +++ b/src/modules/break/break.h @@ -6,6 +6,4 @@ void ffPrintBreak(FFBreakOptions* options); void ffInitBreakOptions(FFBreakOptions* options); -bool ffParseBreakCommandOptions(FFBreakOptions* options, const char* key, const char* value); void ffDestroyBreakOptions(FFBreakOptions* options); -void ffParseBreakJsonObject(FFBreakOptions* options, yyjson_val* module); diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index e17c3d5e3..b49a04d7e 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -84,14 +84,6 @@ void ffPrintBrightness(FFBrightnessOptions* options) } } -void ffInitBrightnessOptions(FFBrightnessOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BRIGHTNESS_MODULE_NAME, ffParseBrightnessCommandOptions, ffParseBrightnessJsonObject, ffPrintBrightness, ffGenerateBrightnessJsonResult, ffPrintBrightnessHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - options->ddcciSleep = 10; -} - bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_BRIGHTNESS_MODULE_NAME); @@ -108,11 +100,6 @@ bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* k return false; } -void ffDestroyBrightnessOptions(FFBrightnessOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -182,3 +169,16 @@ void ffPrintBrightnessHelpFormat(void) "Current brightness value", }); } + +void ffInitBrightnessOptions(FFBrightnessOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BRIGHTNESS_MODULE_NAME, ffParseBrightnessCommandOptions, ffParseBrightnessJsonObject, ffPrintBrightness, ffGenerateBrightnessJsonResult, ffPrintBrightnessHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + options->ddcciSleep = 10; +} + +void ffDestroyBrightnessOptions(FFBrightnessOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/brightness/brightness.h b/src/modules/brightness/brightness.h index 1cda43f89..36faaf304 100644 --- a/src/modules/brightness/brightness.h +++ b/src/modules/brightness/brightness.h @@ -6,8 +6,4 @@ void ffPrintBrightness(FFBrightnessOptions* options); void ffInitBrightnessOptions(FFBrightnessOptions* options); -bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value); void ffDestroyBrightnessOptions(FFBrightnessOptions* options); -void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module); -void ffGenerateBrightnessJsonResult(FFBrightnessOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintBrightnessHelpFormat(void); diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index d4e5a6078..c3b953e43 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -50,12 +50,6 @@ exit: ffStrbufDestroy(&result.version); } -void ffInitChassisOptions(FFChassisOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CHASSIS_MODULE_NAME, ffParseChassisCommandOptions, ffParseChassisJsonObject, ffPrintChassis, ffGenerateChassisJsonResult, ffPrintChassisHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseChassisCommandOptions(FFChassisOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_CHASSIS_MODULE_NAME); @@ -66,11 +60,6 @@ bool ffParseChassisCommandOptions(FFChassisOptions* options, const char* key, co return false; } -void ffDestroyChassisOptions(FFChassisOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -128,3 +117,14 @@ void ffPrintChassisHelpFormat(void) "chassis version" }); } + +void ffInitChassisOptions(FFChassisOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CHASSIS_MODULE_NAME, ffParseChassisCommandOptions, ffParseChassisJsonObject, ffPrintChassis, ffGenerateChassisJsonResult, ffPrintChassisHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyChassisOptions(FFChassisOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/chassis/chassis.h b/src/modules/chassis/chassis.h index 290e101b0..f37358c94 100644 --- a/src/modules/chassis/chassis.h +++ b/src/modules/chassis/chassis.h @@ -6,8 +6,4 @@ void ffPrintChassis(FFChassisOptions* options); void ffInitChassisOptions(FFChassisOptions* options); -bool ffParseChassisCommandOptions(FFChassisOptions* options, const char* key, const char* value); void ffDestroyChassisOptions(FFChassisOptions* options); -void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module); -void ffGenerateChassisJsonResult(FFChassisOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintChassisHelpFormat(void); diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 4ac68d12e..4cbe89df4 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -55,15 +55,6 @@ void ffPrintColors(FFColorsOptions* options) puts(FASTFETCH_TEXT_MODIFIER_RESET); } -void ffInitColorsOptions(FFColorsOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_COLORS_MODULE_NAME, ffParseColorsCommandOptions, ffParseColorsJsonObject, ffPrintColors, NULL, NULL); - ffOptionInitModuleArg(&options->moduleArgs); - ffStrbufSetStatic(&options->moduleArgs.key, " "); - options->symbol = FF_COLORS_SYMBOL_BLOCK; - options->paddingLeft = 0; -} - bool ffParseColorsCommandOptions(FFColorsOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_COLORS_MODULE_NAME); @@ -94,11 +85,6 @@ bool ffParseColorsCommandOptions(FFColorsOptions* options, const char* key, cons return false; } -void ffDestroyColorsOptions(FF_MAYBE_UNUSED FFColorsOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -140,3 +126,17 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); } } + +void ffInitColorsOptions(FFColorsOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_COLORS_MODULE_NAME, ffParseColorsCommandOptions, ffParseColorsJsonObject, ffPrintColors, NULL, NULL); + ffOptionInitModuleArg(&options->moduleArgs); + ffStrbufSetStatic(&options->moduleArgs.key, " "); + options->symbol = FF_COLORS_SYMBOL_BLOCK; + options->paddingLeft = 0; +} + +void ffDestroyColorsOptions(FF_MAYBE_UNUSED FFColorsOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/colors/colors.h b/src/modules/colors/colors.h index 674bcd817..8520f54b6 100644 --- a/src/modules/colors/colors.h +++ b/src/modules/colors/colors.h @@ -7,5 +7,3 @@ void ffPrintColors(FFColorsOptions* options); void ffInitColorsOptions(FFColorsOptions* options); void ffDestroyColorsOptions(FFColorsOptions* options); -bool ffParseColorsCommandOptions(FFColorsOptions* options, const char* key, const char* value); -void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module); diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 397e99304..d5b86d30e 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -45,22 +45,6 @@ void ffPrintCommand(FFCommandOptions* options) } } -void ffInitCommandOptions(FFCommandOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_COMMAND_MODULE_NAME, ffParseCommandCommandOptions, ffParseCommandJsonObject, ffPrintCommand, ffGenerateCommandJsonResult, ffPrintCommandHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInitStatic(&options->shell, - #ifdef _WIN32 - "cmd.exe" - #else - "/bin/sh" - #endif - ); - - ffStrbufInit(&options->text); -} - bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_COMMAND_MODULE_NAME); @@ -83,13 +67,6 @@ bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, co return false; } -void ffDestroyCommandOptions(FFCommandOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - ffStrbufDestroy(&options->shell); - ffStrbufDestroy(&options->text); -} - void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -154,3 +131,26 @@ void ffPrintCommandHelpFormat(void) "Command result" }); } + +void ffInitCommandOptions(FFCommandOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_COMMAND_MODULE_NAME, ffParseCommandCommandOptions, ffParseCommandJsonObject, ffPrintCommand, ffGenerateCommandJsonResult, ffPrintCommandHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInitStatic(&options->shell, + #ifdef _WIN32 + "cmd.exe" + #else + "/bin/sh" + #endif + ); + + ffStrbufInit(&options->text); +} + +void ffDestroyCommandOptions(FFCommandOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + ffStrbufDestroy(&options->shell); + ffStrbufDestroy(&options->text); +} diff --git a/src/modules/command/command.h b/src/modules/command/command.h index a9fa22867..246412801 100644 --- a/src/modules/command/command.h +++ b/src/modules/command/command.h @@ -6,8 +6,4 @@ void ffPrintCommand(FFCommandOptions* options); void ffInitCommandOptions(FFCommandOptions* options); -bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, const char* value); void ffDestroyCommandOptions(FFCommandOptions* options); -void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module); -void ffGenerateCommandJsonResult(FFCommandOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintCommandHelpFormat(void); diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 702ff14e6..0fe0dea42 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -77,14 +77,6 @@ void ffPrintCPU(FFCPUOptions* options) ffStrbufDestroy(&cpu.vendor); } -void ffInitCPUOptions(FFCPUOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CPU_MODULE_NAME, ffParseCPUCommandOptions, ffParseCPUJsonObject, ffPrintCPU, ffGenerateCPUJsonResult, ffPrintCPUHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - options->temp = false; - options->freqNdigits = 2; -} - bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_CPU_MODULE_NAME); @@ -107,11 +99,6 @@ bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char return false; } -void ffDestroyCPUOptions(FFCPUOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -195,3 +182,16 @@ void ffPrintCPUHelpFormat(void) "Temperature" }); } + +void ffInitCPUOptions(FFCPUOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CPU_MODULE_NAME, ffParseCPUCommandOptions, ffParseCPUJsonObject, ffPrintCPU, ffGenerateCPUJsonResult, ffPrintCPUHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + options->temp = false; + options->freqNdigits = 2; +} + +void ffDestroyCPUOptions(FFCPUOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/cpu/cpu.h b/src/modules/cpu/cpu.h index 3daf94d65..1db4efbf7 100644 --- a/src/modules/cpu/cpu.h +++ b/src/modules/cpu/cpu.h @@ -6,8 +6,4 @@ void ffPrintCPU(FFCPUOptions* options); void ffInitCPUOptions(FFCPUOptions* options); -bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char* value); void ffDestroyCPUOptions(FFCPUOptions* options); -void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module); -void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintCPUHelpFormat(void); diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 9fa1e824c..69e938af1 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -85,12 +85,6 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options) } } -void ffInitCPUUsageOptions(FFCPUUsageOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CPUUSAGE_MODULE_NAME, ffParseCPUUsageCommandOptions, ffParseCPUUsageJsonObject, ffPrintCPUUsage, ffGenerateCPUUsageJsonResult, ffPrintCPUUsageHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseCPUUsageCommandOptions(FFCPUUsageOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_CPUUSAGE_MODULE_NAME); @@ -107,11 +101,6 @@ bool ffParseCPUUsageCommandOptions(FFCPUUsageOptions* options, const char* key, return false; } -void ffDestroyCPUUsageOptions(FFCPUUsageOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -162,3 +151,14 @@ void ffPrintCPUUsageHelpFormat(void) "CPU core index of minimum usage", }); } + +void ffInitCPUUsageOptions(FFCPUUsageOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CPUUSAGE_MODULE_NAME, ffParseCPUUsageCommandOptions, ffParseCPUUsageJsonObject, ffPrintCPUUsage, ffGenerateCPUUsageJsonResult, ffPrintCPUUsageHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyCPUUsageOptions(FFCPUUsageOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/cpuusage/cpuusage.h b/src/modules/cpuusage/cpuusage.h index 52c567ee2..bbd74f085 100644 --- a/src/modules/cpuusage/cpuusage.h +++ b/src/modules/cpuusage/cpuusage.h @@ -8,8 +8,4 @@ void ffPrepareCPUUsage(); void ffPrintCPUUsage(FFCPUUsageOptions* options); void ffInitCPUUsageOptions(FFCPUUsageOptions* options); -bool ffParseCPUUsageCommandOptions(FFCPUUsageOptions* options, const char* key, const char* value); void ffDestroyCPUUsageOptions(FFCPUUsageOptions* options); -void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module); -void ffGenerateCPUUsageJsonResult(FFCPUUsageOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintCPUUsageHelpFormat(void); diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 28fec9da8..7b4d20171 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -50,12 +50,6 @@ void ffPrintCursor(FFCursorOptions* options) ffStrbufDestroy(&result.size); } -void ffInitCursorOptions(FFCursorOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CURSOR_MODULE_NAME, ffParseCursorCommandOptions, ffParseCursorJsonObject, ffPrintCursor, ffGenerateCursorJsonResult, ffPrintCursorHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_CURSOR_MODULE_NAME); @@ -66,11 +60,6 @@ bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, cons return false; } -void ffDestroyCursorOptions(FFCursorOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -119,3 +108,14 @@ void ffPrintCursorHelpFormat(void) "Cursor size" }); } + +void ffInitCursorOptions(FFCursorOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CURSOR_MODULE_NAME, ffParseCursorCommandOptions, ffParseCursorJsonObject, ffPrintCursor, ffGenerateCursorJsonResult, ffPrintCursorHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyCursorOptions(FFCursorOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/cursor/cursor.h b/src/modules/cursor/cursor.h index 36b712dfa..939033682 100644 --- a/src/modules/cursor/cursor.h +++ b/src/modules/cursor/cursor.h @@ -6,8 +6,4 @@ void ffPrintCursor(FFCursorOptions* options); void ffInitCursorOptions(FFCursorOptions* options); -bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, const char* value); void ffDestroyCursorOptions(FFCursorOptions* options); -void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module); -void ffGenerateCursorJsonResult(FFCursorOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintCursorHelpFormat(void); diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index 11104d6c1..baccd127c 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -17,13 +17,6 @@ void ffPrintCustom(FFCustomOptions* options) puts(FASTFETCH_TEXT_MODIFIER_RESET); } -void ffInitCustomOptions(FFCustomOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CUSTOM_MODULE_NAME, ffParseCustomCommandOptions, ffParseCustomJsonObject, ffPrintCustom, NULL, NULL); - ffOptionInitModuleArg(&options->moduleArgs); - ffStrbufSetStatic(&options->moduleArgs.key, " "); -} - bool ffParseCustomCommandOptions(FFCustomOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_CUSTOM_MODULE_NAME); @@ -34,11 +27,6 @@ bool ffParseCustomCommandOptions(FFCustomOptions* options, const char* key, cons return false; } -void ffDestroyCustomOptions(FFCustomOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -55,3 +43,15 @@ void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } + +void ffInitCustomOptions(FFCustomOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_CUSTOM_MODULE_NAME, ffParseCustomCommandOptions, ffParseCustomJsonObject, ffPrintCustom, NULL, NULL); + ffOptionInitModuleArg(&options->moduleArgs); + ffStrbufSetStatic(&options->moduleArgs.key, " "); +} + +void ffDestroyCustomOptions(FFCustomOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/custom/custom.h b/src/modules/custom/custom.h index 4c4c40b5d..172fe9ea3 100644 --- a/src/modules/custom/custom.h +++ b/src/modules/custom/custom.h @@ -6,6 +6,4 @@ void ffPrintCustom(FFCustomOptions* options); void ffInitCustomOptions(FFCustomOptions* options); -bool ffParseCustomCommandOptions(FFCustomOptions* options, const char* key, const char* value); void ffDestroyCustomOptions(FFCustomOptions* options); -void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module); diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index ad0987c71..6c4bb29ce 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -141,12 +141,6 @@ void ffPrintDateTime(FFDateTimeOptions* options) puts(buffer); } -void ffInitDateTimeOptions(FFDateTimeOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DATETIME_MODULE_NAME, ffParseDateTimeCommandOptions, ffParseDateTimeJsonObject, ffPrintDateTime, ffGenerateDateTimeJsonResult, ffPrintDateTimeHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_DATETIME_MODULE_NAME); @@ -157,11 +151,6 @@ bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, return false; } -void ffDestroyDateTimeOptions(FFDateTimeOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -209,3 +198,14 @@ void ffPrintDateTimeHelpFormat(void) "second with leading zero" }); } + +void ffInitDateTimeOptions(FFDateTimeOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DATETIME_MODULE_NAME, ffParseDateTimeCommandOptions, ffParseDateTimeJsonObject, ffPrintDateTime, ffGenerateDateTimeJsonResult, ffPrintDateTimeHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyDateTimeOptions(FFDateTimeOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/datetime/datetime.h b/src/modules/datetime/datetime.h index 6356fd408..b169e73d1 100644 --- a/src/modules/datetime/datetime.h +++ b/src/modules/datetime/datetime.h @@ -6,8 +6,4 @@ void ffPrintDateTime(FFDateTimeOptions* options); void ffInitDateTimeOptions(FFDateTimeOptions* options); -bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value); void ffDestroyDateTimeOptions(FFDateTimeOptions* options); -void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module); -void ffGenerateDateTimeJsonResult(FFDateTimeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintDateTimeHelpFormat(void); diff --git a/src/modules/de/de.c b/src/modules/de/de.c index a14204cce..83b361733 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -40,12 +40,6 @@ void ffPrintDE(FFDEOptions* options) } } -void ffInitDEOptions(FFDEOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DE_MODULE_NAME, ffParseDECommandOptions, ffParseDEJsonObject, ffPrintDE, ffGenerateDEJsonResult, ffPrintDEHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_DE_MODULE_NAME); @@ -56,11 +50,6 @@ bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* return false; } -void ffDestroyDEOptions(FFDEOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -102,3 +91,14 @@ void ffPrintDEHelpFormat(void) "DE version" }); } + +void ffInitDEOptions(FFDEOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DE_MODULE_NAME, ffParseDECommandOptions, ffParseDEJsonObject, ffPrintDE, ffGenerateDEJsonResult, ffPrintDEHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyDEOptions(FFDEOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/de/de.h b/src/modules/de/de.h index c33143319..01cc458aa 100644 --- a/src/modules/de/de.h +++ b/src/modules/de/de.h @@ -6,8 +6,4 @@ void ffPrintDE(FFDEOptions* options); void ffInitDEOptions(FFDEOptions* options); -bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value); void ffDestroyDEOptions(FFDEOptions* options); -void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module); -void ffGenerateDEJsonResult(FFDEOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintDEHelpFormat(void); diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 874b26c2a..0fbcc86b8 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -202,16 +202,6 @@ void ffPrintDisk(FFDiskOptions* options) } } -void ffInitDiskOptions(FFDiskOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISK_MODULE_NAME, ffParseDiskCommandOptions, ffParseDiskJsonObject, ffPrintDisk, ffGenerateDiskJsonResult, ffPrintDiskHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInit(&options->folders); - options->showTypes = FF_DISK_VOLUME_TYPE_REGULAR_BIT | FF_DISK_VOLUME_TYPE_EXTERNAL_BIT | FF_DISK_VOLUME_TYPE_READONLY_BIT; - options->calcType = FF_DISK_CALC_TYPE_FREE; -} - bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_DISK_MODULE_NAME); @@ -291,11 +281,6 @@ bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const ch return false; } -void ffDestroyDiskOptions(FFDiskOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -440,3 +425,18 @@ void ffPrintDiskHelpFormat(void) "Filesystem" }); } + +void ffInitDiskOptions(FFDiskOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISK_MODULE_NAME, ffParseDiskCommandOptions, ffParseDiskJsonObject, ffPrintDisk, ffGenerateDiskJsonResult, ffPrintDiskHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInit(&options->folders); + options->showTypes = FF_DISK_VOLUME_TYPE_REGULAR_BIT | FF_DISK_VOLUME_TYPE_EXTERNAL_BIT | FF_DISK_VOLUME_TYPE_READONLY_BIT; + options->calcType = FF_DISK_CALC_TYPE_FREE; +} + +void ffDestroyDiskOptions(FFDiskOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/disk/disk.h b/src/modules/disk/disk.h index f28403b15..e21531eae 100644 --- a/src/modules/disk/disk.h +++ b/src/modules/disk/disk.h @@ -6,8 +6,4 @@ void ffPrintDisk(FFDiskOptions* options); void ffInitDiskOptions(FFDiskOptions* options); -bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const char* value); void ffDestroyDiskOptions(FFDiskOptions* options); -void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module); -void ffGenerateDiskJsonResult(FFDiskOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintDiskHelpFormat(void); diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 205b2abb6..ef1b72801 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -112,14 +112,6 @@ void ffPrintDiskIO(FFDiskIOOptions* options) } } -void ffInitDiskIOOptions(FFDiskIOOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISKIO_MODULE_NAME, ffParseDiskIOCommandOptions, ffParseDiskIOJsonObject, ffPrintDiskIO, ffGenerateDiskIOJsonResult, ffPrintDiskIOHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInit(&options->namePrefix); -} - bool ffParseDiskIOCommandOptions(FFDiskIOOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_DISKIO_MODULE_NAME); @@ -136,12 +128,6 @@ bool ffParseDiskIOCommandOptions(FFDiskIOOptions* options, const char* key, cons return false; } -void ffDestroyDiskIOOptions(FFDiskIOOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - ffStrbufDestroy(&options->namePrefix); -} - void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -226,3 +212,17 @@ void ffPrintDiskIOHelpFormat(void) "Number of writes", }); } + +void ffInitDiskIOOptions(FFDiskIOOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISKIO_MODULE_NAME, ffParseDiskIOCommandOptions, ffParseDiskIOJsonObject, ffPrintDiskIO, ffGenerateDiskIOJsonResult, ffPrintDiskIOHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInit(&options->namePrefix); +} + +void ffDestroyDiskIOOptions(FFDiskIOOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + ffStrbufDestroy(&options->namePrefix); +} diff --git a/src/modules/diskio/diskio.h b/src/modules/diskio/diskio.h index 5c048cbfd..b3fa27bde 100644 --- a/src/modules/diskio/diskio.h +++ b/src/modules/diskio/diskio.h @@ -8,8 +8,4 @@ void ffPrepareDiskIO(FFDiskIOOptions* options); void ffPrintDiskIO(FFDiskIOOptions* options); void ffInitDiskIOOptions(FFDiskIOOptions* options); -bool ffParseDiskIOCommandOptions(FFDiskIOOptions* options, const char* key, const char* value); void ffDestroyDiskIOOptions(FFDiskIOOptions* options); -void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module); -void ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintDiskIOHelpFormat(void); diff --git a/src/modules/display/display.c b/src/modules/display/display.c index d7b870568..13f83c689 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -109,14 +109,6 @@ void ffPrintDisplay(FFDisplayOptions* options) } } -void ffInitDisplayOptions(FFDisplayOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISPLAY_MODULE_NAME, ffParseDisplayCommandOptions, ffParseDisplayJsonObject, ffPrintDisplay, ffGenerateDisplayJsonResult, ffPrintDisplayHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - options->compactType = FF_DISPLAY_COMPACT_TYPE_NONE; - options->preciseRefreshRate = false; -} - bool ffParseDisplayCommandOptions(FFDisplayOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_DISPLAY_MODULE_NAME); @@ -144,11 +136,6 @@ bool ffParseDisplayCommandOptions(FFDisplayOptions* options, const char* key, co return false; } -void ffDestroyDisplayOptions(FFDisplayOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -238,3 +225,16 @@ void ffPrintDisplayHelpFormat(void) "Screen rotation (in degrees)", }); } + +void ffInitDisplayOptions(FFDisplayOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DISPLAY_MODULE_NAME, ffParseDisplayCommandOptions, ffParseDisplayJsonObject, ffPrintDisplay, ffGenerateDisplayJsonResult, ffPrintDisplayHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + options->compactType = FF_DISPLAY_COMPACT_TYPE_NONE; + options->preciseRefreshRate = false; +} + +void ffDestroyDisplayOptions(FFDisplayOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/display/display.h b/src/modules/display/display.h index b592afd99..7479295cf 100644 --- a/src/modules/display/display.h +++ b/src/modules/display/display.h @@ -6,8 +6,4 @@ void ffPrintDisplay(FFDisplayOptions* options); void ffInitDisplayOptions(FFDisplayOptions* options); -bool ffParseDisplayCommandOptions(FFDisplayOptions* options, const char* key, const char* value); void ffDestroyDisplayOptions(FFDisplayOptions* options); -void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module); -void ffGenerateDisplayJsonResult(FFDisplayOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintDisplayHelpFormat(void); diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 93becab47..589a15331 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -43,12 +43,6 @@ void ffPrintFont(FFFontOptions* options) ffStrbufDestroy(&font.fonts[i]); } -void ffInitFontOptions(FFFontOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_FONT_MODULE_NAME, ffParseFontCommandOptions, ffParseFontJsonObject, ffPrintFont, ffGenerateFontJsonResult, ffPrintFontHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseFontCommandOptions(FFFontOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_FONT_MODULE_NAME); @@ -59,11 +53,6 @@ bool ffParseFontCommandOptions(FFFontOptions* options, const char* key, const ch return false; } -void ffDestroyFontOptions(FFFontOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -117,3 +106,14 @@ void ffPrintFontHelpFormat(void) "Combined fonts" }); } + +void ffInitFontOptions(FFFontOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_FONT_MODULE_NAME, ffParseFontCommandOptions, ffParseFontJsonObject, ffPrintFont, ffGenerateFontJsonResult, ffPrintFontHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyFontOptions(FFFontOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/font/font.h b/src/modules/font/font.h index a4239578e..01d78f0ec 100644 --- a/src/modules/font/font.h +++ b/src/modules/font/font.h @@ -6,8 +6,4 @@ void ffPrintFont(FFFontOptions* options); void ffInitFontOptions(FFFontOptions* options); -bool ffParseFontCommandOptions(FFFontOptions* options, const char* key, const char* value); void ffDestroyFontOptions(FFFontOptions* options); -void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module); -void ffGenerateFontJsonResult(FFFontOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintFontHelpFormat(void); diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index a6b8a60cd..39194b30c 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -49,12 +49,6 @@ void ffPrintGamepad(FFGamepadOptions* options) } } -void ffInitGamepadOptions(FFGamepadOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_GAMEPAD_MODULE_NAME, ffParseGamepadCommandOptions, ffParseGamepadJsonObject, ffPrintGamepad, ffGenerateGamepadJsonResult, ffPrintGamepadHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseGamepadCommandOptions(FFGamepadOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_GAMEPAD_MODULE_NAME); @@ -65,11 +59,6 @@ bool ffParseGamepadCommandOptions(FFGamepadOptions* options, const char* key, co return false; } -void ffDestroyGamepadOptions(FFGamepadOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -127,3 +116,14 @@ void ffPrintGamepadHelpFormat(void) "Identifier" }); } + +void ffInitGamepadOptions(FFGamepadOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_GAMEPAD_MODULE_NAME, ffParseGamepadCommandOptions, ffParseGamepadJsonObject, ffPrintGamepad, ffGenerateGamepadJsonResult, ffPrintGamepadHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyGamepadOptions(FFGamepadOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/gamepad/gamepad.h b/src/modules/gamepad/gamepad.h index cd37d9144..309edd0a7 100644 --- a/src/modules/gamepad/gamepad.h +++ b/src/modules/gamepad/gamepad.h @@ -6,8 +6,4 @@ void ffPrintGamepad(FFGamepadOptions* options); void ffInitGamepadOptions(FFGamepadOptions* options); -bool ffParseGamepadCommandOptions(FFGamepadOptions* options, const char* key, const char* value); void ffDestroyGamepadOptions(FFGamepadOptions* options); -void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module); -void ffGenerateGamepadJsonResult(FFGamepadOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintGamepadHelpFormat(void); diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 84412b0a1..3189549fa 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -123,16 +123,6 @@ void ffPrintGPU(FFGPUOptions* options) } } -void ffInitGPUOptions(FFGPUOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_GPU_MODULE_NAME, ffParseGPUCommandOptions, ffParseGPUJsonObject, ffPrintGPU, ffGenerateGPUJsonResult, ffPrintGPUHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - options->forceVulkan = false; - options->temp = false; - options->hideType = FF_GPU_TYPE_UNKNOWN; -} - bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_GPU_MODULE_NAME); @@ -165,11 +155,6 @@ bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char return false; } -void ffDestroyGPUOptions(FFGPUOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -297,3 +282,18 @@ void ffPrintGPUHelpFormat(void) "GPU used shared memory", }); } + +void ffInitGPUOptions(FFGPUOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_GPU_MODULE_NAME, ffParseGPUCommandOptions, ffParseGPUJsonObject, ffPrintGPU, ffGenerateGPUJsonResult, ffPrintGPUHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + options->forceVulkan = false; + options->temp = false; + options->hideType = FF_GPU_TYPE_UNKNOWN; +} + +void ffDestroyGPUOptions(FFGPUOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/gpu/gpu.h b/src/modules/gpu/gpu.h index 575e1bd67..36dbd441d 100644 --- a/src/modules/gpu/gpu.h +++ b/src/modules/gpu/gpu.h @@ -6,8 +6,4 @@ void ffPrintGPU(FFGPUOptions* options); void ffInitGPUOptions(FFGPUOptions* options); -bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char* value); void ffDestroyGPUOptions(FFGPUOptions* options); -void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module); -void ffGenerateGPUJsonResult(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintGPUHelpFormat(void); diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 9705351de..28c5ab5f3 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -65,12 +65,6 @@ exit: ffStrbufDestroy(&host.sysVendor); } -void ffInitHostOptions(FFHostOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_HOST_MODULE_NAME, ffParseHostCommandOptions, ffParseHostJsonObject, ffPrintHost, ffGenerateHostJsonResult, ffPrintHostHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseHostCommandOptions(FFHostOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_HOST_MODULE_NAME); @@ -81,11 +75,6 @@ bool ffParseHostCommandOptions(FFHostOptions* options, const char* key, const ch return false; } -void ffDestroyHostOptions(FFHostOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -150,3 +139,14 @@ void ffPrintHostHelpFormat(void) "sys vendor" }); } + +void ffInitHostOptions(FFHostOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_HOST_MODULE_NAME, ffParseHostCommandOptions, ffParseHostJsonObject, ffPrintHost, ffGenerateHostJsonResult, ffPrintHostHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyHostOptions(FFHostOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/host/host.h b/src/modules/host/host.h index 3e0aa150e..780849bf2 100644 --- a/src/modules/host/host.h +++ b/src/modules/host/host.h @@ -6,8 +6,4 @@ void ffPrintHost(FFHostOptions* options); void ffInitHostOptions(FFHostOptions* options); -bool ffParseHostCommandOptions(FFHostOptions* options, const char* key, const char* value); void ffDestroyHostOptions(FFHostOptions* options); -void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module); -void ffGenerateHostJsonResult(FFHostOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintHostHelpFormat(void); diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index 646df67ea..eff569649 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -30,12 +30,6 @@ void ffPrintIcons(FFIconsOptions* options) } } -void ffInitIconsOptions(FFIconsOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_ICONS_MODULE_NAME, ffParseIconsCommandOptions, ffParseIconsJsonObject, ffPrintIcons, ffGenerateIconsJsonResult, ffPrintIconsHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseIconsCommandOptions(FFIconsOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_ICONS_MODULE_NAME); @@ -46,11 +40,6 @@ bool ffParseIconsCommandOptions(FFIconsOptions* options, const char* key, const return false; } -void ffDestroyIconsOptions(FFIconsOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -88,3 +77,14 @@ void ffPrintIconsHelpFormat(void) "Combined icons" }); } + +void ffInitIconsOptions(FFIconsOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_ICONS_MODULE_NAME, ffParseIconsCommandOptions, ffParseIconsJsonObject, ffPrintIcons, ffGenerateIconsJsonResult, ffPrintIconsHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyIconsOptions(FFIconsOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/icons/icons.h b/src/modules/icons/icons.h index 5c390c577..d31a83a9a 100644 --- a/src/modules/icons/icons.h +++ b/src/modules/icons/icons.h @@ -6,8 +6,4 @@ void ffPrintIcons(FFIconsOptions* options); void ffInitIconsOptions(FFIconsOptions* options); -bool ffParseIconsCommandOptions(FFIconsOptions* options, const char* key, const char* value); void ffDestroyIconsOptions(FFIconsOptions* options); -void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module); -void ffGenerateIconsJsonResult(FFIconsOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintIconsHelpFormat(void); diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index bd6acaa37..4fab5cd7d 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -30,12 +30,6 @@ void ffPrintKernel(FFKernelOptions* options) } } -void ffInitKernelOptions(FFKernelOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_KERNEL_MODULE_NAME, ffParseKernelCommandOptions, ffParseKernelJsonObject, ffPrintKernel, ffGenerateKernelJsonResult, ffPrintKernelHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_KERNEL_MODULE_NAME); @@ -46,11 +40,6 @@ bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, cons return false; } -void ffDestroyKernelOptions(FFKernelOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -86,3 +75,14 @@ void ffPrintKernelHelpFormat(void) "Kernel version" }); } + +void ffInitKernelOptions(FFKernelOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_KERNEL_MODULE_NAME, ffParseKernelCommandOptions, ffParseKernelJsonObject, ffPrintKernel, ffGenerateKernelJsonResult, ffPrintKernelHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyKernelOptions(FFKernelOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/kernel/kernel.h b/src/modules/kernel/kernel.h index 523c8caa7..c1a6be856 100644 --- a/src/modules/kernel/kernel.h +++ b/src/modules/kernel/kernel.h @@ -6,8 +6,4 @@ void ffPrintKernel(FFKernelOptions* options); void ffInitKernelOptions(FFKernelOptions* options); -bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, const char* value); void ffDestroyKernelOptions(FFKernelOptions* options); -void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module); -void ffGenerateKernelJsonResult(FFKernelOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintKernelHelpFormat(void); diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index e44279cb4..95aa56896 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -49,12 +49,6 @@ void ffPrintLM(FFLMOptions* options) ffStrbufDestroy(&result.version); } -void ffInitLMOptions(FFLMOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LM_MODULE_NAME, ffParseLMCommandOptions, ffParseLMJsonObject, ffPrintLM, ffGenerateLMJsonResult, ffPrintLMHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseLMCommandOptions(FFLMOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_LM_MODULE_NAME); @@ -65,11 +59,6 @@ bool ffParseLMCommandOptions(FFLMOptions* options, const char* key, const char* return false; } -void ffDestroyLMOptions(FFLMOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -126,3 +115,14 @@ void ffPrintLMHelpFormat(void) "LM version" }); } + +void ffInitLMOptions(FFLMOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LM_MODULE_NAME, ffParseLMCommandOptions, ffParseLMJsonObject, ffPrintLM, ffGenerateLMJsonResult, ffPrintLMHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyLMOptions(FFLMOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/lm/lm.h b/src/modules/lm/lm.h index b234acad8..f6e1569e1 100644 --- a/src/modules/lm/lm.h +++ b/src/modules/lm/lm.h @@ -6,8 +6,4 @@ void ffPrintLM(FFLMOptions* options); void ffInitLMOptions(FFLMOptions* options); -bool ffParseLMCommandOptions(FFLMOptions* options, const char* key, const char* value); void ffDestroyLMOptions(FFLMOptions* options); -void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module); -void ffGenerateLMJsonResult(FFLMOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintLMHelpFormat(void); diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 31b03ef0a..18e4e67a7 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -30,12 +30,6 @@ void ffPrintLocale(FFLocaleOptions* options) } } -void ffInitLocaleOptions(FFLocaleOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LOCALE_MODULE_NAME, ffParseLocaleCommandOptions, ffParseLocaleJsonObject, ffPrintLocale, ffGenerateLocaleJsonResult, ffPrintLocaleHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseLocaleCommandOptions(FFLocaleOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_LOCALE_MODULE_NAME); @@ -46,11 +40,6 @@ bool ffParseLocaleCommandOptions(FFLocaleOptions* options, const char* key, cons return false; } -void ffDestroyLocaleOptions(FFLocaleOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -88,3 +77,14 @@ void ffPrintLocaleHelpFormat(void) "Locale code" }); } + +void ffInitLocaleOptions(FFLocaleOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LOCALE_MODULE_NAME, ffParseLocaleCommandOptions, ffParseLocaleJsonObject, ffPrintLocale, ffGenerateLocaleJsonResult, ffPrintLocaleHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyLocaleOptions(FFLocaleOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/locale/locale.h b/src/modules/locale/locale.h index 451995b82..c1fe3f8f7 100644 --- a/src/modules/locale/locale.h +++ b/src/modules/locale/locale.h @@ -6,8 +6,4 @@ void ffPrintLocale(FFLocaleOptions* options); void ffInitLocaleOptions(FFLocaleOptions* options); -bool ffParseLocaleCommandOptions(FFLocaleOptions* options, const char* key, const char* value); void ffDestroyLocaleOptions(FFLocaleOptions* options); -void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module); -void ffGenerateLocaleJsonResult(FFLocaleOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintLocaleHelpFormat(void); diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index fc70f8479..f95b1cfc0 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -131,16 +131,6 @@ void ffPrintLocalIp(FFLocalIpOptions* options) } } -void ffInitLocalIpOptions(FFLocalIpOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LOCALIP_MODULE_NAME, ffParseLocalIpCommandOptions, ffParseLocalIpJsonObject, ffPrintLocalIp, ffGenerateLocalIpJsonResult, ffPrintLocalIpHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - options->showType = FF_LOCALIP_TYPE_IPV4_BIT; - ffStrbufInit(&options->namePrefix); - options->defaultRouteOnly = false; -} - bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_LOCALIP_MODULE_NAME); @@ -208,12 +198,6 @@ bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, co return false; } -void ffDestroyLocalIpOptions(FFLocalIpOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - ffStrbufDestroy(&options->namePrefix); -} - void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -337,3 +321,19 @@ void ffPrintLocalIpHelpFormat(void) "Is default route" }); } + +void ffInitLocalIpOptions(FFLocalIpOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_LOCALIP_MODULE_NAME, ffParseLocalIpCommandOptions, ffParseLocalIpJsonObject, ffPrintLocalIp, ffGenerateLocalIpJsonResult, ffPrintLocalIpHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + options->showType = FF_LOCALIP_TYPE_IPV4_BIT; + ffStrbufInit(&options->namePrefix); + options->defaultRouteOnly = false; +} + +void ffDestroyLocalIpOptions(FFLocalIpOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + ffStrbufDestroy(&options->namePrefix); +} diff --git a/src/modules/localip/localip.h b/src/modules/localip/localip.h index ee07ebdb1..1ac255979 100644 --- a/src/modules/localip/localip.h +++ b/src/modules/localip/localip.h @@ -6,8 +6,4 @@ void ffPrintLocalIp(FFLocalIpOptions* options); void ffInitLocalIpOptions(FFLocalIpOptions* options); -bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, const char* value); void ffDestroyLocalIpOptions(FFLocalIpOptions* options); -void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module); -void ffGenerateLocalIpJsonResult(FFLocalIpOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintLocalIpHelpFormat(void); diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 472404e4d..7769dc4fa 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -105,12 +105,6 @@ void ffPrintMedia(FFMediaOptions* options) } } -void ffInitMediaOptions(FFMediaOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MEDIA_MODULE_NAME, ffParseMediaCommandOptions, ffParseMediaJsonObject, ffPrintMedia, ffGenerateMediaJsonResult, ffPrintMediaHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseMediaCommandOptions(FFMediaOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_MEDIA_MODULE_NAME); @@ -121,11 +115,6 @@ bool ffParseMediaCommandOptions(FFMediaOptions* options, const char* key, const return false; } -void ffDestroyMediaOptions(FFMediaOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -170,3 +159,14 @@ void ffPrintMediaHelpFormat(void) "Status", }); } + +void ffInitMediaOptions(FFMediaOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MEDIA_MODULE_NAME, ffParseMediaCommandOptions, ffParseMediaJsonObject, ffPrintMedia, ffGenerateMediaJsonResult, ffPrintMediaHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyMediaOptions(FFMediaOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/media/media.h b/src/modules/media/media.h index c0e581bdb..7c010b1fe 100644 --- a/src/modules/media/media.h +++ b/src/modules/media/media.h @@ -6,8 +6,4 @@ void ffPrintMedia(FFMediaOptions* options); void ffInitMediaOptions(FFMediaOptions* options); -bool ffParseMediaCommandOptions(FFMediaOptions* options, const char* key, const char* value); void ffDestroyMediaOptions(FFMediaOptions* options); -void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module); -void ffGenerateMediaJsonResult(FFMediaOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintMediaHelpFormat(void); diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 44156a52e..018ab2def 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -66,12 +66,6 @@ void ffPrintMemory(FFMemoryOptions* options) } } -void ffInitMemoryOptions(FFMemoryOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MEMORY_MODULE_NAME, ffParseMemoryCommandOptions, ffParseMemoryJsonObject, ffPrintMemory, ffGenerateMemoryJsonResult, ffPrintMemoryHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseMemoryCommandOptions(FFMemoryOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_MEMORY_MODULE_NAME); @@ -82,11 +76,6 @@ bool ffParseMemoryCommandOptions(FFMemoryOptions* options, const char* key, cons return false; } -void ffDestroyMemoryOptions(FFMemoryOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -128,3 +117,14 @@ void ffPrintMemoryHelpFormat(void) "Percentage used" }); } + +void ffInitMemoryOptions(FFMemoryOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MEMORY_MODULE_NAME, ffParseMemoryCommandOptions, ffParseMemoryJsonObject, ffPrintMemory, ffGenerateMemoryJsonResult, ffPrintMemoryHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyMemoryOptions(FFMemoryOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/memory/memory.h b/src/modules/memory/memory.h index ffdeb45fa..dcef5e50d 100644 --- a/src/modules/memory/memory.h +++ b/src/modules/memory/memory.h @@ -6,8 +6,4 @@ void ffPrintMemory(FFMemoryOptions* options); void ffInitMemoryOptions(FFMemoryOptions* options); -bool ffParseMemoryCommandOptions(FFMemoryOptions* options, const char* key, const char* value); void ffDestroyMemoryOptions(FFMemoryOptions* options); -void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module); -void ffGenerateMemoryJsonResult(FFMemoryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintMemoryHelpFormat(void); diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 732a4ef4e..cd42ddf35 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -75,12 +75,6 @@ void ffPrintMonitor(FFMonitorOptions* options) } } -void ffInitMonitorOptions(FFMonitorOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MONITOR_MODULE_NAME, ffParseMonitorCommandOptions, ffParseMonitorJsonObject, ffPrintMonitor, ffGenerateMonitorJsonResult, ffPrintMonitorHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_MONITOR_MODULE_NAME); @@ -91,11 +85,6 @@ bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, co return false; } -void ffDestroyMonitorOptions(FFMonitorOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -160,3 +149,14 @@ void ffPrintMonitorHelpFormat(void) "Display physical pixels per inch (PPI)" }); } + +void ffInitMonitorOptions(FFMonitorOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_MONITOR_MODULE_NAME, ffParseMonitorCommandOptions, ffParseMonitorJsonObject, ffPrintMonitor, ffGenerateMonitorJsonResult, ffPrintMonitorHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyMonitorOptions(FFMonitorOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/monitor/monitor.h b/src/modules/monitor/monitor.h index 3d860df02..d928c2ffe 100644 --- a/src/modules/monitor/monitor.h +++ b/src/modules/monitor/monitor.h @@ -6,8 +6,4 @@ void ffPrintMonitor(FFMonitorOptions* options); void ffInitMonitorOptions(FFMonitorOptions* options); -bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, const char* value); void ffDestroyMonitorOptions(FFMonitorOptions* options); -void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module); -void ffGenerateMonitorJsonResult(FFMonitorOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintMonitorHelpFormat(void); diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 490ad93d1..8f76365fd 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -99,15 +99,6 @@ void ffPrintNetIO(FFNetIOOptions* options) } } -void ffInitNetIOOptions(FFNetIOOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_NETIO_MODULE_NAME, ffParseNetIOCommandOptions, ffParseNetIOJsonObject, ffPrintNetIO, ffGenerateNetIOJsonResult, ffPrintNetIOHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInit(&options->namePrefix); - options->defaultRouteOnly = false; -} - bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_NETIO_MODULE_NAME); @@ -130,12 +121,6 @@ bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const return false; } -void ffDestroyNetIOOptions(FFNetIOOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - ffStrbufDestroy(&options->namePrefix); -} - void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -215,3 +200,18 @@ void ffPrintNetIOHelpFormat(void) "Number of packets dropped when sending per second", }); } + +void ffInitNetIOOptions(FFNetIOOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_NETIO_MODULE_NAME, ffParseNetIOCommandOptions, ffParseNetIOJsonObject, ffPrintNetIO, ffGenerateNetIOJsonResult, ffPrintNetIOHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInit(&options->namePrefix); + options->defaultRouteOnly = false; +} + +void ffDestroyNetIOOptions(FFNetIOOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + ffStrbufDestroy(&options->namePrefix); +} diff --git a/src/modules/netio/netio.h b/src/modules/netio/netio.h index aead4d6e0..5b94e4bf2 100644 --- a/src/modules/netio/netio.h +++ b/src/modules/netio/netio.h @@ -8,8 +8,4 @@ void ffPrepareNetIO(FFNetIOOptions* options); void ffPrintNetIO(FFNetIOOptions* options); void ffInitNetIOOptions(FFNetIOOptions* options); -bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const char* value); void ffDestroyNetIOOptions(FFNetIOOptions* options); -void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module); -void ffGenerateNetIOJsonResult(FFNetIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintNetIOHelpFormat(void); diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index b4a2e9a73..fd9015cb3 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -39,12 +39,6 @@ void ffPrintOpenCL(FFOpenCLOptions* options) ffStrbufDestroy(&opencl.vendor); } -void ffInitOpenCLOptions(FFOpenCLOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OPENCL_MODULE_NAME, ffParseOpenCLCommandOptions, ffParseOpenCLJsonObject, ffPrintOpenCL, ffGenerateOpenCLJsonResult, ffPrintOpenCLHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseOpenCLCommandOptions(FFOpenCLOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_OPENCL_MODULE_NAME); @@ -55,11 +49,6 @@ bool ffParseOpenCLCommandOptions(FFOpenCLOptions* options, const char* key, cons return false; } -void ffDestroyOpenCLOptions(FFOpenCLOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -111,3 +100,14 @@ void ffPrintOpenCLHelpFormat(void) "vendor" }); } + +void ffInitOpenCLOptions(FFOpenCLOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OPENCL_MODULE_NAME, ffParseOpenCLCommandOptions, ffParseOpenCLJsonObject, ffPrintOpenCL, ffGenerateOpenCLJsonResult, ffPrintOpenCLHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyOpenCLOptions(FFOpenCLOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/opencl/opencl.h b/src/modules/opencl/opencl.h index 5a9bc3573..f378e3f0b 100644 --- a/src/modules/opencl/opencl.h +++ b/src/modules/opencl/opencl.h @@ -6,8 +6,4 @@ void ffPrintOpenCL(FFOpenCLOptions* options); void ffInitOpenCLOptions(FFOpenCLOptions* options); -bool ffParseOpenCLCommandOptions(FFOpenCLOptions* options, const char* key, const char* value); void ffDestroyOpenCLOptions(FFOpenCLOptions* options); -void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module); -void ffGenerateOpenCLJsonResult(FFOpenCLOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintOpenCLHelpFormat(void); diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 9c6f949c8..b579c7526 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -42,16 +42,6 @@ void ffPrintOpenGL(FFOpenGLOptions* options) ffStrbufDestroy(&result.slv); } -void ffInitOpenGLOptions(FFOpenGLOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OPENGL_MODULE_NAME, ffParseOpenGLCommandOptions, ffParseOpenGLJsonObject, ffPrintOpenGL, ffGenerateOpenGLJsonResult, ffPrintOpenGLHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - #if defined(__linux__) || defined(__FreeBSD__) - options->library = FF_OPENGL_LIBRARY_AUTO; - #endif -} - bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_OPENGL_MODULE_NAME); @@ -75,11 +65,6 @@ bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, cons return false; } -void ffDestroyOpenGLOptions(FFOpenGLOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -153,3 +138,18 @@ void ffPrintOpenGLHelpFormat(void) "shading language version" }); } + +void ffInitOpenGLOptions(FFOpenGLOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OPENGL_MODULE_NAME, ffParseOpenGLCommandOptions, ffParseOpenGLJsonObject, ffPrintOpenGL, ffGenerateOpenGLJsonResult, ffPrintOpenGLHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + #if defined(__linux__) || defined(__FreeBSD__) + options->library = FF_OPENGL_LIBRARY_AUTO; + #endif +} + +void ffDestroyOpenGLOptions(FFOpenGLOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/opengl/opengl.h b/src/modules/opengl/opengl.h index e94b5b7fb..0f9d34735 100644 --- a/src/modules/opengl/opengl.h +++ b/src/modules/opengl/opengl.h @@ -6,8 +6,4 @@ void ffPrintOpenGL(FFOpenGLOptions* options); void ffInitOpenGLOptions(FFOpenGLOptions* options); -bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, const char* value); void ffDestroyOpenGLOptions(FFOpenGLOptions* options); -void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module); -void ffGenerateOpenGLJsonResult(FFOpenGLOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintOpenGLHelpFormat(void); diff --git a/src/modules/os/os.c b/src/modules/os/os.c index d969805f6..037c769ca 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -136,12 +136,6 @@ void ffPrintOS(FFOSOptions* options) } } -void ffInitOSOptions(FFOSOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OS_MODULE_NAME, ffParseOSCommandOptions, ffParseOSJsonObject, ffPrintOS, ffGenerateOSJsonResult, ffPrintOSHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_OS_MODULE_NAME); @@ -152,11 +146,6 @@ bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char* return false; } -void ffDestroyOSOptions(FFOSOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -214,3 +203,14 @@ void ffPrintOSHelpFormat(void) "Architecture of the OS" }); } + +void ffInitOSOptions(FFOSOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_OS_MODULE_NAME, ffParseOSCommandOptions, ffParseOSJsonObject, ffPrintOS, ffGenerateOSJsonResult, ffPrintOSHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyOSOptions(FFOSOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/os/os.h b/src/modules/os/os.h index db357d70c..ff2aa787d 100644 --- a/src/modules/os/os.h +++ b/src/modules/os/os.h @@ -6,8 +6,4 @@ void ffPrintOS(FFOSOptions* options); void ffInitOSOptions(FFOSOptions* options); -bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char* value); void ffDestroyOSOptions(FFOSOptions* options); -void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module); -void ffGenerateOSJsonResult(FFOSOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintOSHelpFormat(void); diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 42fdd724f..be900d904 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -102,12 +102,6 @@ void ffPrintPackages(FFPackagesOptions* options) ffStrbufDestroy(&counts.pacmanBranch); } -void ffInitPackagesOptions(FFPackagesOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PACKAGES_MODULE_NAME, ffParsePackagesCommandOptions, ffParsePackagesJsonObject, ffPrintPackages, ffGeneratePackagesJsonResult, ffPrintPackagesHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_PACKAGES_MODULE_NAME); @@ -118,11 +112,6 @@ bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, return false; } -void ffDestroyPackagesOptions(FFPackagesOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -214,3 +203,14 @@ void ffPrintPackagesHelpFormat(void) "Number of opkg packages" }); } + +void ffInitPackagesOptions(FFPackagesOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PACKAGES_MODULE_NAME, ffParsePackagesCommandOptions, ffParsePackagesJsonObject, ffPrintPackages, ffGeneratePackagesJsonResult, ffPrintPackagesHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyPackagesOptions(FFPackagesOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/packages/packages.h b/src/modules/packages/packages.h index 426e7fe47..97b8b4c91 100644 --- a/src/modules/packages/packages.h +++ b/src/modules/packages/packages.h @@ -6,8 +6,4 @@ void ffPrintPackages(FFPackagesOptions* options); void ffInitPackagesOptions(FFPackagesOptions* options); -bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, const char* value); void ffDestroyPackagesOptions(FFPackagesOptions* options); -void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module); -void ffGeneratePackagesJsonResult(FFPackagesOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintPackagesHelpFormat(void); diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 77898b364..ff0860f63 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -73,12 +73,6 @@ void ffPrintPlayer(FFPlayerOptions* options) } } -void ffInitPlayerOptions(FFPlayerOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PLAYER_MODULE_NAME, ffParsePlayerCommandOptions, ffParsePlayerJsonObject, ffPrintPlayer, ffGeneratePlayerJsonResult, ffPrintPlayerHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParsePlayerCommandOptions(FFPlayerOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_PLAYER_MODULE_NAME); @@ -89,11 +83,6 @@ bool ffParsePlayerCommandOptions(FFPlayerOptions* options, const char* key, cons return false; } -void ffDestroyPlayerOptions(FFPlayerOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -136,3 +125,14 @@ void ffPrintPlayerHelpFormat(void) "URL name" }); } + +void ffInitPlayerOptions(FFPlayerOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PLAYER_MODULE_NAME, ffParsePlayerCommandOptions, ffParsePlayerJsonObject, ffPrintPlayer, ffGeneratePlayerJsonResult, ffPrintPlayerHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyPlayerOptions(FFPlayerOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/player/player.h b/src/modules/player/player.h index d2e4ea140..3912a3fe3 100644 --- a/src/modules/player/player.h +++ b/src/modules/player/player.h @@ -7,8 +7,4 @@ void ffPrintPlayer(FFPlayerOptions* options); void ffInitPlayerOptions(FFPlayerOptions* options); -bool ffParsePlayerCommandOptions(FFPlayerOptions* options, const char* key, const char* value); void ffDestroyPlayerOptions(FFPlayerOptions* options); -void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module); -void ffGeneratePlayerJsonResult(FFMediaOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintPlayerHelpFormat(void); diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 2cd639c42..626861b22 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -60,12 +60,6 @@ void ffPrintPowerAdapter(FFPowerAdapterOptions* options) } } -void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_POWERADAPTER_MODULE_NAME, ffParsePowerAdapterCommandOptions, ffParsePowerAdapterJsonObject, ffPrintPowerAdapter, ffGeneratePowerAdapterJsonResult, ffPrintPowerAdapterHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParsePowerAdapterCommandOptions(FFPowerAdapterOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_POWERADAPTER_MODULE_NAME); @@ -76,11 +70,6 @@ bool ffParsePowerAdapterCommandOptions(FFPowerAdapterOptions* options, const cha return false; } -void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -137,3 +126,14 @@ void ffPrintPowerAdapterHelpFormat(void) "PowerAdapter description" }); } + +void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_POWERADAPTER_MODULE_NAME, ffParsePowerAdapterCommandOptions, ffParsePowerAdapterJsonObject, ffPrintPowerAdapter, ffGeneratePowerAdapterJsonResult, ffPrintPowerAdapterHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/poweradapter/poweradapter.h b/src/modules/poweradapter/poweradapter.h index 58b18e601..315c6e749 100644 --- a/src/modules/poweradapter/poweradapter.h +++ b/src/modules/poweradapter/poweradapter.h @@ -6,8 +6,4 @@ void ffPrintPowerAdapter(FFPowerAdapterOptions* options); void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options); -bool ffParsePowerAdapterCommandOptions(FFPowerAdapterOptions* options, const char* key, const char* value); void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options); -void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* module); -void ffGeneratePowerAdapterJsonResult(FFPowerAdapterOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintPowerAdapterHelpFormat(void); diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index e6bda6004..ea9517234 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -31,12 +31,6 @@ void ffPrintProcesses(FFProcessesOptions* options) } } -void ffInitProcessesOptions(FFProcessesOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PROCESSES_MODULE_NAME, ffParseProcessesCommandOptions, ffParseProcessesJsonObject, ffPrintProcesses, ffGenerateProcessesJsonResult, ffPrintProcessesHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_PROCESSES_MODULE_NAME); @@ -47,11 +41,6 @@ bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key return false; } -void ffDestroyProcessesOptions(FFProcessesOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -89,3 +78,14 @@ void ffPrintProcessesHelpFormat(void) "Count" }); } + +void ffInitProcessesOptions(FFProcessesOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PROCESSES_MODULE_NAME, ffParseProcessesCommandOptions, ffParseProcessesJsonObject, ffPrintProcesses, ffGenerateProcessesJsonResult, ffPrintProcessesHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyProcessesOptions(FFProcessesOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/processes/processes.h b/src/modules/processes/processes.h index 74ae83e45..d2159ca0e 100644 --- a/src/modules/processes/processes.h +++ b/src/modules/processes/processes.h @@ -6,8 +6,4 @@ void ffPrintProcesses(FFProcessesOptions* options); void ffInitProcessesOptions(FFProcessesOptions* options); -bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key, const char* value); void ffDestroyProcessesOptions(FFProcessesOptions* options); -void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module); -void ffGenerateProcessesJsonResult(FFProcessesOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintProcessesHelpFormat(void); diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index a815a9935..7a469536e 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -40,15 +40,6 @@ void ffPrintPublicIp(FFPublicIpOptions* options) ffStrbufDestroy(&result.location); } -void ffInitPublicIpOptions(FFPublicIpOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PUBLICIP_MODULE_NAME, ffParsePublicIpCommandOptions, ffParsePublicIpJsonObject, ffPrintPublicIp, ffGeneratePublicIpJsonResult, ffPrintPublicIpHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInit(&options->url); - options->timeout = 0; -} - bool ffParsePublicIpCommandOptions(FFPublicIpOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_PUBLICIP_MODULE_NAME); @@ -71,13 +62,6 @@ bool ffParsePublicIpCommandOptions(FFPublicIpOptions* options, const char* key, return false; } -void ffDestroyPublicIpOptions(FFPublicIpOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - - ffStrbufDestroy(&options->url); -} - void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -135,3 +119,19 @@ void ffPrintPublicIpHelpFormat(void) "Location" }); } + +void ffInitPublicIpOptions(FFPublicIpOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_PUBLICIP_MODULE_NAME, ffParsePublicIpCommandOptions, ffParsePublicIpJsonObject, ffPrintPublicIp, ffGeneratePublicIpJsonResult, ffPrintPublicIpHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInit(&options->url); + options->timeout = 0; +} + +void ffDestroyPublicIpOptions(FFPublicIpOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + + ffStrbufDestroy(&options->url); +} diff --git a/src/modules/publicip/publicip.h b/src/modules/publicip/publicip.h index 0b8792382..e54bab809 100644 --- a/src/modules/publicip/publicip.h +++ b/src/modules/publicip/publicip.h @@ -8,8 +8,4 @@ void ffPreparePublicIp(FFPublicIpOptions* options); void ffPrintPublicIp(FFPublicIpOptions* options); void ffInitPublicIpOptions(FFPublicIpOptions* options); -bool ffParsePublicIpCommandOptions(FFPublicIpOptions* options, const char* key, const char* value); void ffDestroyPublicIpOptions(FFPublicIpOptions* options); -void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module); -void ffGeneratePublicIpJsonResult(FFPublicIpOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintPublicIpHelpFormat(void); diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index 75cd4eea7..5d0c87e6d 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -75,12 +75,6 @@ void ffPrintSeparator(FFSeparatorOptions* options) putchar('\n'); } -void ffInitSeparatorOptions(FFSeparatorOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SEPARATOR_MODULE_NAME, ffParseSeparatorCommandOptions, ffParseSeparatorJsonObject, ffPrintSeparator, NULL, NULL); - ffStrbufInit(&options->string); -} - bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_SEPARATOR_MODULE_NAME); @@ -95,11 +89,6 @@ bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key return false; } -void ffDestroySeparatorOptions(FFSeparatorOptions* options) -{ - ffStrbufDestroy(&options->string); -} - void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -119,3 +108,14 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module) ffPrintErrorString(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); } } + +void ffInitSeparatorOptions(FFSeparatorOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SEPARATOR_MODULE_NAME, ffParseSeparatorCommandOptions, ffParseSeparatorJsonObject, ffPrintSeparator, NULL, NULL); + ffStrbufInit(&options->string); +} + +void ffDestroySeparatorOptions(FFSeparatorOptions* options) +{ + ffStrbufDestroy(&options->string); +} diff --git a/src/modules/separator/separator.h b/src/modules/separator/separator.h index a5dc91285..bca935521 100644 --- a/src/modules/separator/separator.h +++ b/src/modules/separator/separator.h @@ -6,6 +6,4 @@ void ffPrintSeparator(FFSeparatorOptions* options); void ffInitSeparatorOptions(FFSeparatorOptions* options); -bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key, const char* value); void ffDestroySeparatorOptions(FFSeparatorOptions* options); -void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module); diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index 3e63e4523..a74a0eb6e 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -42,12 +42,6 @@ void ffPrintShell(FFShellOptions* options) } } -void ffInitShellOptions(FFShellOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SHELL_MODULE_NAME, ffParseShellCommandOptions, ffParseShellJsonObject, ffPrintShell, ffGenerateShellJsonResult, ffPrintShellHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_SHELL_MODULE_NAME); @@ -58,11 +52,6 @@ bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const return false; } -void ffDestroyShellOptions(FFShellOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -109,3 +98,14 @@ void ffPrintShellHelpFormat(void) "Shell pretty name" }); } + +void ffInitShellOptions(FFShellOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SHELL_MODULE_NAME, ffParseShellCommandOptions, ffParseShellJsonObject, ffPrintShell, ffGenerateShellJsonResult, ffPrintShellHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyShellOptions(FFShellOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/shell/shell.h b/src/modules/shell/shell.h index dac01eb7c..01f9f17de 100644 --- a/src/modules/shell/shell.h +++ b/src/modules/shell/shell.h @@ -6,8 +6,4 @@ void ffPrintShell(FFShellOptions* options); void ffInitShellOptions(FFShellOptions* options); -bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const char* value); void ffDestroyShellOptions(FFShellOptions* options); -void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module); -void ffGenerateShellJsonResult(FFShellOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintShellHelpFormat(void); diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index 97a6a05ac..2c00a388f 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -83,14 +83,6 @@ void ffPrintSound(FFSoundOptions* options) } -void ffInitSoundOptions(FFSoundOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SOUND_MODULE_NAME, ffParseSoundCommandOptions, ffParseSoundJsonObject, ffPrintSound, ffGenerateSoundJsonResult, ffPrintSoundHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - options->soundType = FF_SOUND_TYPE_MAIN; -} - bool ffParseSoundCommandOptions(FFSoundOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_SOUND_MODULE_NAME); @@ -112,11 +104,6 @@ bool ffParseSoundCommandOptions(FFSoundOptions* options, const char* key, const return false; } -void ffDestroySoundOptions(FFSoundOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -199,3 +186,16 @@ void ffPrintSoundHelpFormat(void) "Identifier" }); } + +void ffInitSoundOptions(FFSoundOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SOUND_MODULE_NAME, ffParseSoundCommandOptions, ffParseSoundJsonObject, ffPrintSound, ffGenerateSoundJsonResult, ffPrintSoundHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + options->soundType = FF_SOUND_TYPE_MAIN; +} + +void ffDestroySoundOptions(FFSoundOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/sound/sound.h b/src/modules/sound/sound.h index de90d8472..35c3f2a7b 100644 --- a/src/modules/sound/sound.h +++ b/src/modules/sound/sound.h @@ -6,8 +6,4 @@ void ffPrintSound(FFSoundOptions* options); void ffInitSoundOptions(FFSoundOptions* options); -bool ffParseSoundCommandOptions(FFSoundOptions* options, const char* key, const char* value); void ffDestroySoundOptions(FFSoundOptions* options); -void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module); -void ffGenerateSoundJsonResult(FFSoundOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintSoundHelpFormat(void); diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 1397ee9fd..d0c3d080a 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -73,12 +73,6 @@ void ffPrintSwap(FFSwapOptions* options) } } -void ffInitSwapOptions(FFSwapOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SWAP_MODULE_NAME, ffParseSwapCommandOptions, ffParseSwapJsonObject, ffPrintSwap, ffGenerateSwapJsonResult, ffPrintSwapHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseSwapCommandOptions(FFSwapOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_SWAP_MODULE_NAME); @@ -89,11 +83,6 @@ bool ffParseSwapCommandOptions(FFSwapOptions* options, const char* key, const ch return false; } -void ffDestroySwapOptions(FFSwapOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -135,3 +124,14 @@ void ffPrintSwapHelpFormat(void) "Percentage used" }); } + +void ffInitSwapOptions(FFSwapOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_SWAP_MODULE_NAME, ffParseSwapCommandOptions, ffParseSwapJsonObject, ffPrintSwap, ffGenerateSwapJsonResult, ffPrintSwapHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroySwapOptions(FFSwapOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/swap/swap.h b/src/modules/swap/swap.h index 177f503fa..b44ae4df3 100644 --- a/src/modules/swap/swap.h +++ b/src/modules/swap/swap.h @@ -6,8 +6,4 @@ void ffPrintSwap(FFSwapOptions* options); void ffInitSwapOptions(FFSwapOptions* options); -bool ffParseSwapCommandOptions(FFSwapOptions* options, const char* key, const char* value); void ffDestroySwapOptions(FFSwapOptions* options); -void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module); -void ffGenerateSwapJsonResult(FFSwapOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintSwapHelpFormat(void); diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 73eb004b0..6cb379575 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -40,12 +40,6 @@ void ffPrintTerminal(FFTerminalOptions* options) } } -void ffInitTerminalOptions(FFTerminalOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINAL_MODULE_NAME, ffParseTerminalCommandOptions, ffParseTerminalJsonObject, ffPrintTerminal, ffGenerateTerminalJsonResult, ffPrintTerminalHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_TERMINAL_MODULE_NAME); @@ -56,11 +50,6 @@ bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, return false; } -void ffDestroyTerminalOptions(FFTerminalOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -108,3 +97,14 @@ void ffPrintTerminalHelpFormat(void) "Terminal version" }); } + +void ffInitTerminalOptions(FFTerminalOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINAL_MODULE_NAME, ffParseTerminalCommandOptions, ffParseTerminalJsonObject, ffPrintTerminal, ffGenerateTerminalJsonResult, ffPrintTerminalHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyTerminalOptions(FFTerminalOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/terminal/terminal.h b/src/modules/terminal/terminal.h index 0655f86c7..9e1bbf75e 100644 --- a/src/modules/terminal/terminal.h +++ b/src/modules/terminal/terminal.h @@ -6,8 +6,4 @@ void ffPrintTerminal(FFTerminalOptions* options); void ffInitTerminalOptions(FFTerminalOptions* options); -bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, const char* value); void ffDestroyTerminalOptions(FFTerminalOptions* options); -void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module); -void ffGenerateTerminalJsonResult(FFTerminalOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintTerminalHelpFormat(void); diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 8bf5f6395..a1be63293 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -47,12 +47,6 @@ void ffPrintTerminalFont(FFTerminalFontOptions* options) ffFontDestroy(&terminalFont.fallback); } -void ffInitTerminalFontOptions(FFTerminalFontOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALFONT_MODULE_NAME, ffParseTerminalFontCommandOptions, ffParseTerminalFontJsonObject, ffPrintTerminalFont, ffGenerateTerminalFontJsonResult, ffPrintTerminalFontHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseTerminalFontCommandOptions(FFTerminalFontOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_TERMINALFONT_MODULE_NAME); @@ -63,11 +57,6 @@ bool ffParseTerminalFontCommandOptions(FFTerminalFontOptions* options, const cha return false; } -void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -134,3 +123,14 @@ void ffPrintTerminalFontHelpFormat(void) "Terminal font styles" }); } + +void ffInitTerminalFontOptions(FFTerminalFontOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALFONT_MODULE_NAME, ffParseTerminalFontCommandOptions, ffParseTerminalFontJsonObject, ffPrintTerminalFont, ffGenerateTerminalFontJsonResult, ffPrintTerminalFontHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/terminalfont/terminalfont.h b/src/modules/terminalfont/terminalfont.h index 78f54524a..01eee0802 100644 --- a/src/modules/terminalfont/terminalfont.h +++ b/src/modules/terminalfont/terminalfont.h @@ -6,8 +6,4 @@ void ffPrintTerminalFont(FFTerminalFontOptions* options); void ffInitTerminalFontOptions(FFTerminalFontOptions* options); -bool ffParseTerminalFontCommandOptions(FFTerminalFontOptions* options, const char* key, const char* value); void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options); -void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* module); -void ffGenerateTerminalFontJsonResult(FFTerminalOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintTerminalFontHelpFormat(void); diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 92ea0b99c..3d94d09c4 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -39,12 +39,6 @@ void ffPrintTerminalSize(FFTerminalSizeOptions* options) } } -void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALSIZE_MODULE_NAME, ffParseTerminalSizeCommandOptions, ffParseTerminalSizeJsonObject, ffPrintTerminalSize, ffGenerateTerminalSizeJsonResult, ffPrintTerminalSizeHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseTerminalSizeCommandOptions(FFTerminalSizeOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_TERMINALSIZE_MODULE_NAME); @@ -55,11 +49,6 @@ bool ffParseTerminalSizeCommandOptions(FFTerminalSizeOptions* options, const cha return false; } -void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -103,3 +92,14 @@ void ffPrintTerminalSizeHelpFormat(void) "Terminal height (in pixels)" }); } + +void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALSIZE_MODULE_NAME, ffParseTerminalSizeCommandOptions, ffParseTerminalSizeJsonObject, ffPrintTerminalSize, ffGenerateTerminalSizeJsonResult, ffPrintTerminalSizeHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/terminalsize/terminalsize.h b/src/modules/terminalsize/terminalsize.h index 4d1a5c28c..e88f8b6c7 100644 --- a/src/modules/terminalsize/terminalsize.h +++ b/src/modules/terminalsize/terminalsize.h @@ -6,8 +6,4 @@ void ffPrintTerminalSize(FFTerminalSizeOptions* options); void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options); -bool ffParseTerminalSizeCommandOptions(FFTerminalSizeOptions* options, const char* key, const char* value); void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options); -void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* module); -void ffGenerateTerminalSizeJsonResult(FFTerminalOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintTerminalSizeHelpFormat(void); diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index d4b7364ad..2f373d0ae 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -30,12 +30,6 @@ void ffPrintTheme(FFThemeOptions* options) } } -void ffInitThemeOptions(FFThemeOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_THEME_MODULE_NAME, ffParseThemeCommandOptions, ffParseThemeJsonObject, ffPrintTheme, ffGenerateThemeJsonResult, ffPrintThemeHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseThemeCommandOptions(FFThemeOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_THEME_MODULE_NAME); @@ -46,11 +40,6 @@ bool ffParseThemeCommandOptions(FFThemeOptions* options, const char* key, const return false; } -void ffDestroyThemeOptions(FFThemeOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -88,3 +77,14 @@ void ffPrintThemeHelpFormat(void) "Combined themes" }); } + +void ffInitThemeOptions(FFThemeOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_THEME_MODULE_NAME, ffParseThemeCommandOptions, ffParseThemeJsonObject, ffPrintTheme, ffGenerateThemeJsonResult, ffPrintThemeHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyThemeOptions(FFThemeOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/theme/theme.h b/src/modules/theme/theme.h index ed11cf014..6ead202bf 100644 --- a/src/modules/theme/theme.h +++ b/src/modules/theme/theme.h @@ -6,8 +6,4 @@ void ffPrintTheme(FFThemeOptions* options); void ffInitThemeOptions(FFThemeOptions* options); -bool ffParseThemeCommandOptions(FFThemeOptions* options, const char* key, const char* value); void ffDestroyThemeOptions(FFThemeOptions* options); -void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module); -void ffGenerateThemeJsonResult(FFThemeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintThemeHelpFormat(void); diff --git a/src/modules/title/title.c b/src/modules/title/title.c index b0d301a5a..d1283be27 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -69,18 +69,6 @@ void ffPrintTitle(FFTitleOptions* options) } } -void ffInitTitleOptions(FFTitleOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TITLE_MODULE_NAME, ffParseTitleCommandOptions, ffParseTitleJsonObject, ffPrintTitle, ffGenerateTitleJsonResult, ffPrintTitleHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - ffStrbufSetStatic(&options->moduleArgs.key, " "); - - options->fqdn = false; - ffStrbufInit(&options->colorUser); - ffStrbufInit(&options->colorAt); - ffStrbufInit(&options->colorHost); -} - bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_TITLE_MODULE_NAME); @@ -115,14 +103,6 @@ bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const return false; } -void ffDestroyTitleOptions(FFTitleOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - ffStrbufDestroy(&options->colorUser); - ffStrbufDestroy(&options->colorAt); - ffStrbufDestroy(&options->colorHost); -} - void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -186,3 +166,23 @@ void ffPrintTitleHelpFormat(void) "Host name (colored)" }); } + +void ffInitTitleOptions(FFTitleOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TITLE_MODULE_NAME, ffParseTitleCommandOptions, ffParseTitleJsonObject, ffPrintTitle, ffGenerateTitleJsonResult, ffPrintTitleHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + ffStrbufSetStatic(&options->moduleArgs.key, " "); + + options->fqdn = false; + ffStrbufInit(&options->colorUser); + ffStrbufInit(&options->colorAt); + ffStrbufInit(&options->colorHost); +} + +void ffDestroyTitleOptions(FFTitleOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + ffStrbufDestroy(&options->colorUser); + ffStrbufDestroy(&options->colorAt); + ffStrbufDestroy(&options->colorHost); +} diff --git a/src/modules/title/title.h b/src/modules/title/title.h index 059b2dcc7..83ddfa9b5 100644 --- a/src/modules/title/title.h +++ b/src/modules/title/title.h @@ -6,8 +6,4 @@ void ffPrintTitle(FFTitleOptions* options); void ffInitTitleOptions(FFTitleOptions* options); -bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value); void ffDestroyTitleOptions(FFTitleOptions* options); -void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module); -void ffGenerateTitleJsonResult(FFTitleOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintTitleHelpFormat(void); diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index ba8a031ca..dbef0de67 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -89,12 +89,6 @@ void ffPrintUptime(FFUptimeOptions* options) } } -void ffInitUptimeOptions(FFUptimeOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_UPTIME_MODULE_NAME, ffParseUptimeCommandOptions, ffParseUptimeJsonObject, ffPrintUptime, ffGenerateUptimeJsonResult, ffPrintUptimeHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_UPTIME_MODULE_NAME); @@ -105,11 +99,6 @@ bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, cons return false; } -void ffDestroyUptimeOptions(FFUptimeOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseUptimeJsonObject(FFUptimeOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -152,3 +141,14 @@ void ffPrintUptimeHelpFormat(void) "Seconds" }); } + +void ffInitUptimeOptions(FFUptimeOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_UPTIME_MODULE_NAME, ffParseUptimeCommandOptions, ffParseUptimeJsonObject, ffPrintUptime, ffGenerateUptimeJsonResult, ffPrintUptimeHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyUptimeOptions(FFUptimeOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/uptime/uptime.h b/src/modules/uptime/uptime.h index 5ce932a49..17b6c1bc6 100644 --- a/src/modules/uptime/uptime.h +++ b/src/modules/uptime/uptime.h @@ -6,8 +6,4 @@ void ffPrintUptime(FFUptimeOptions* options); void ffInitUptimeOptions(FFUptimeOptions* options); -bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, const char* value); void ffDestroyUptimeOptions(FFUptimeOptions* options); -void ffParseUptimeJsonObject(FFUptimeOptions* options, yyjson_val* module); -void ffGenerateUptimeJsonResult(FFUptimeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintUptimeHelpFormat(void); diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 3235283a6..8df069fb4 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -91,14 +91,6 @@ void ffPrintUsers(FFUsersOptions* options) } } -void ffInitUsersOptions(FFUsersOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_USERS_MODULE_NAME, ffParseUsersCommandOptions, ffParseUsersJsonObject, ffPrintUsers, ffGenerateUsersJsonResult, ffPrintUsersHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - options->compact = false; -} - bool ffParseUsersCommandOptions(FFUsersOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_USERS_MODULE_NAME); @@ -115,11 +107,6 @@ bool ffParseUsersCommandOptions(FFUsersOptions* options, const char* key, const return false; } -void ffDestroyUsersOptions(FFUsersOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseUsersJsonObject(FFUsersOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -186,3 +173,16 @@ void ffPrintUsersHelpFormat(void) "Login Time" }); } + +void ffInitUsersOptions(FFUsersOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_USERS_MODULE_NAME, ffParseUsersCommandOptions, ffParseUsersJsonObject, ffPrintUsers, ffGenerateUsersJsonResult, ffPrintUsersHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + options->compact = false; +} + +void ffDestroyUsersOptions(FFUsersOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/users/users.h b/src/modules/users/users.h index 9947d4ce4..81d3dd3f5 100644 --- a/src/modules/users/users.h +++ b/src/modules/users/users.h @@ -6,8 +6,4 @@ void ffPrintUsers(FFUsersOptions* options); void ffInitUsersOptions(FFUsersOptions* options); -bool ffParseUsersCommandOptions(FFUsersOptions* options, const char* key, const char* value); void ffDestroyUsersOptions(FFUsersOptions* options); -void ffParseUsersJsonObject(FFUsersOptions* options, yyjson_val* module); -void ffGenerateUsersJsonResult(FFUsersOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintUsersHelpFormat(void); diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 933ecc46d..860a56079 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -45,12 +45,6 @@ void ffPrintVersion(FFVersionOptions* options) } } -void ffInitVersionOptions(FFVersionOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_VERSION_MODULE_NAME, ffParseVersionCommandOptions, ffParseVersionJsonObject, ffPrintVersion, ffGenerateVersionJsonResult, ffPrintVersionHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseVersionCommandOptions(FFVersionOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_VERSION_MODULE_NAME); @@ -61,11 +55,6 @@ bool ffParseVersionCommandOptions(FFVersionOptions* options, const char* key, co return false; } -void ffDestroyVersionOptions(FFVersionOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseVersionJsonObject(FFVersionOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -129,3 +118,14 @@ void ffPrintVersionHelpFormat(void) "Libc used" }); } + +void ffInitVersionOptions(FFVersionOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_VERSION_MODULE_NAME, ffParseVersionCommandOptions, ffParseVersionJsonObject, ffPrintVersion, ffGenerateVersionJsonResult, ffPrintVersionHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyVersionOptions(FFVersionOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/version/version.h b/src/modules/version/version.h index 2881af0d6..1cab28d94 100644 --- a/src/modules/version/version.h +++ b/src/modules/version/version.h @@ -6,8 +6,4 @@ void ffPrintVersion(FFVersionOptions* options); void ffInitVersionOptions(FFVersionOptions* options); -bool ffParseVersionCommandOptions(FFVersionOptions* options, const char* key, const char* value); void ffDestroyVersionOptions(FFVersionOptions* options); -void ffParseVersionJsonObject(FFVersionOptions* options, yyjson_val* module); -void ffGenerateVersionJsonResult(FFVersionOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintVersionHelpFormat(void); diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index 839e52407..5fa1bca9c 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -44,12 +44,6 @@ void ffPrintVulkan(FFVulkanOptions* options) } } -void ffInitVulkanOptions(FFVulkanOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_VULKAN_MODULE_NAME, ffParseVulkanCommandOptions, ffParseVulkanJsonObject, ffPrintVulkan, ffGenerateVulkanJsonResult, ffPrintVulkanHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_VULKAN_MODULE_NAME); @@ -60,11 +54,6 @@ bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, cons return false; } -void ffDestroyVulkanOptions(FFVulkanOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -145,3 +134,14 @@ void ffPrintVulkanHelpFormat(void) "Conformance version" }); } + +void ffInitVulkanOptions(FFVulkanOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_VULKAN_MODULE_NAME, ffParseVulkanCommandOptions, ffParseVulkanJsonObject, ffPrintVulkan, ffGenerateVulkanJsonResult, ffPrintVulkanHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyVulkanOptions(FFVulkanOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/vulkan/vulkan.h b/src/modules/vulkan/vulkan.h index 9a4954b67..397c42093 100644 --- a/src/modules/vulkan/vulkan.h +++ b/src/modules/vulkan/vulkan.h @@ -6,8 +6,4 @@ void ffPrintVulkan(FFVulkanOptions* options); void ffInitVulkanOptions(FFVulkanOptions* options); -bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, const char* value); void ffDestroyVulkanOptions(FFVulkanOptions* options); -void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module); -void ffGenerateVulkanJsonResult(FFVulkanOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintVulkanHelpFormat(void); diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index dfcfd3466..c5c7de2cb 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -42,12 +42,6 @@ void ffPrintWallpaper(FFWallpaperOptions* options) } } -void ffInitWallpaperOptions(FFWallpaperOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WALLPAPER_MODULE_NAME, ffParseWallpaperCommandOptions, ffParseWallpaperJsonObject, ffPrintWallpaper, ffGenerateWallpaperJsonResult, ffPrintWallpaperHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseWallpaperCommandOptions(FFWallpaperOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_WALLPAPER_MODULE_NAME); @@ -58,11 +52,6 @@ bool ffParseWallpaperCommandOptions(FFWallpaperOptions* options, const char* key return false; } -void ffDestroyWallpaperOptions(FFWallpaperOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseWallpaperJsonObject(FFWallpaperOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -98,3 +87,14 @@ void ffPrintWallpaperHelpFormat(void) "Wallpaper image file" }); } + +void ffInitWallpaperOptions(FFWallpaperOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WALLPAPER_MODULE_NAME, ffParseWallpaperCommandOptions, ffParseWallpaperJsonObject, ffPrintWallpaper, ffGenerateWallpaperJsonResult, ffPrintWallpaperHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyWallpaperOptions(FFWallpaperOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/wallpaper/wallpaper.h b/src/modules/wallpaper/wallpaper.h index ec51a9918..a2c804ae3 100644 --- a/src/modules/wallpaper/wallpaper.h +++ b/src/modules/wallpaper/wallpaper.h @@ -6,8 +6,4 @@ void ffPrintWallpaper(FFWallpaperOptions* options); void ffInitWallpaperOptions(FFWallpaperOptions* options); -bool ffParseWallpaperCommandOptions(FFWallpaperOptions* options, const char* key, const char* value); void ffDestroyWallpaperOptions(FFWallpaperOptions* options); -void ffParseWallpaperJsonObject(FFWallpaperOptions* options, yyjson_val* module); -void ffGenerateWallpaperJsonResult(FFWallpaperOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintWallpaperHelpFormat(void); diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index fff967a52..47c5f1bc8 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -31,16 +31,6 @@ void ffPrintWeather(FFWeatherOptions* options) } } -void ffInitWeatherOptions(FFWeatherOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WEATHER_MODULE_NAME, ffParseWeatherCommandOptions, ffParseWeatherJsonObject, ffPrintWeather, ffGenerateWeatherJsonResult, ffPrintWeatherHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); - - ffStrbufInit(&options->location); - ffStrbufInitStatic(&options->outputFormat, "%t+-+%C+(%l)"); - options->timeout = 0; -} - bool ffParseWeatherCommandOptions(FFWeatherOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_WEATHER_MODULE_NAME); @@ -69,13 +59,6 @@ bool ffParseWeatherCommandOptions(FFWeatherOptions* options, const char* key, co return false; } -void ffDestroyWeatherOptions(FFWeatherOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); - - ffStrbufDestroy(&options->outputFormat); -} - void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -131,3 +114,20 @@ void ffPrintWeatherHelpFormat(void) "Weather result" }); } + +void ffInitWeatherOptions(FFWeatherOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WEATHER_MODULE_NAME, ffParseWeatherCommandOptions, ffParseWeatherJsonObject, ffPrintWeather, ffGenerateWeatherJsonResult, ffPrintWeatherHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); + + ffStrbufInit(&options->location); + ffStrbufInitStatic(&options->outputFormat, "%t+-+%C+(%l)"); + options->timeout = 0; +} + +void ffDestroyWeatherOptions(FFWeatherOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); + + ffStrbufDestroy(&options->outputFormat); +} diff --git a/src/modules/weather/weather.h b/src/modules/weather/weather.h index 7bb0f1367..1ec2f02a2 100644 --- a/src/modules/weather/weather.h +++ b/src/modules/weather/weather.h @@ -8,8 +8,4 @@ void ffPrepareWeather(FFWeatherOptions* options); void ffPrintWeather(FFWeatherOptions* options); void ffInitWeatherOptions(FFWeatherOptions* options); -bool ffParseWeatherCommandOptions(FFWeatherOptions* options, const char* key, const char* value); void ffDestroyWeatherOptions(FFWeatherOptions* options); -void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module); -void ffGenerateWeatherJsonResult(FFWeatherOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintWeatherHelpFormat(void); diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index b7d73497e..766eac1ec 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -70,12 +70,6 @@ void ffPrintWifi(FFWifiOptions* options) } } -void ffInitWifiOptions(FFWifiOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WIFI_MODULE_NAME, ffParseWifiCommandOptions, ffParseWifiJsonObject, ffPrintWifi, ffGenerateWifiJsonResult, ffPrintWifiHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_WIFI_MODULE_NAME); @@ -86,11 +80,6 @@ bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const ch return false; } -void ffDestroyWifiOptions(FFWifiOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -169,3 +158,14 @@ void ffPrintWifiHelpFormat(void) "Connection Security algorithm" }); } + +void ffInitWifiOptions(FFWifiOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WIFI_MODULE_NAME, ffParseWifiCommandOptions, ffParseWifiJsonObject, ffPrintWifi, ffGenerateWifiJsonResult, ffPrintWifiHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyWifiOptions(FFWifiOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/wifi/wifi.h b/src/modules/wifi/wifi.h index 88f1c208f..bd23565d3 100644 --- a/src/modules/wifi/wifi.h +++ b/src/modules/wifi/wifi.h @@ -6,8 +6,4 @@ void ffPrintWifi(FFWifiOptions* options); void ffInitWifiOptions(FFWifiOptions* options); -bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const char* value); void ffDestroyWifiOptions(FFWifiOptions* options); -void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module); -void ffGenerateWifiJsonResult(FFWifiOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintWifiHelpFormat(void); diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index de232bc95..973eabac7 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -41,12 +41,6 @@ void ffPrintWM(FFWMOptions* options) } } -void ffInitWMOptions(FFWMOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WM_MODULE_NAME, ffParseWMCommandOptions, ffParseWMJsonObject, ffPrintWM, ffGenerateWMJsonResult, ffPrintWMHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseWMCommandOptions(FFWMOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_WM_MODULE_NAME); @@ -57,11 +51,6 @@ bool ffParseWMCommandOptions(FFWMOptions* options, const char* key, const char* return false; } -void ffDestroyWMOptions(FFWMOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseWMJsonObject(FFWMOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -102,3 +91,14 @@ void ffPrintWMHelpFormat(void) "WM protocol name" }); } + +void ffInitWMOptions(FFWMOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WM_MODULE_NAME, ffParseWMCommandOptions, ffParseWMJsonObject, ffPrintWM, ffGenerateWMJsonResult, ffPrintWMHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyWMOptions(FFWMOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/wm/wm.h b/src/modules/wm/wm.h index 3253b6ad1..93edec8b4 100644 --- a/src/modules/wm/wm.h +++ b/src/modules/wm/wm.h @@ -6,8 +6,4 @@ void ffPrintWM(FFWMOptions* options); void ffInitWMOptions(FFWMOptions* options); -bool ffParseWMCommandOptions(FFWMOptions* options, const char* key, const char* value); void ffDestroyWMOptions(FFWMOptions* options); -void ffParseWMJsonObject(FFWMOptions* options, yyjson_val* module); -void ffGenerateWMJsonResult(FFWMOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintWMHelpFormat(void); diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 27f194e1e..f47260aed 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -30,12 +30,6 @@ void ffPrintWMTheme(FFWMThemeOptions* options) } } -void ffInitWMThemeOptions(FFWMThemeOptions* options) -{ - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WMTHEME_MODULE_NAME, ffParseWMThemeCommandOptions, ffParseWMThemeJsonObject, ffPrintWMTheme, ffGenerateWMThemeJsonResult, ffPrintWMthemeHelpFormat); - ffOptionInitModuleArg(&options->moduleArgs); -} - bool ffParseWMThemeCommandOptions(FFWMThemeOptions* options, const char* key, const char* value) { const char* subKey = ffOptionTestPrefix(key, FF_WMTHEME_MODULE_NAME); @@ -46,11 +40,6 @@ bool ffParseWMThemeCommandOptions(FFWMThemeOptions* options, const char* key, co return false; } -void ffDestroyWMThemeOptions(FFWMThemeOptions* options) -{ - ffOptionDestroyModuleArg(&options->moduleArgs); -} - void ffParseWMThemeJsonObject(FFWMThemeOptions* options, yyjson_val* module) { yyjson_val *key_, *val; @@ -86,3 +75,14 @@ void ffPrintWMthemeHelpFormat(void) "WM theme" }); } + +void ffInitWMThemeOptions(FFWMThemeOptions* options) +{ + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WMTHEME_MODULE_NAME, ffParseWMThemeCommandOptions, ffParseWMThemeJsonObject, ffPrintWMTheme, ffGenerateWMThemeJsonResult, ffPrintWMthemeHelpFormat); + ffOptionInitModuleArg(&options->moduleArgs); +} + +void ffDestroyWMThemeOptions(FFWMThemeOptions* options) +{ + ffOptionDestroyModuleArg(&options->moduleArgs); +} diff --git a/src/modules/wmtheme/wmtheme.h b/src/modules/wmtheme/wmtheme.h index 187d2f18e..9a2a24982 100644 --- a/src/modules/wmtheme/wmtheme.h +++ b/src/modules/wmtheme/wmtheme.h @@ -6,8 +6,4 @@ void ffPrintWMTheme(FFWMThemeOptions* options); void ffInitWMThemeOptions(FFWMThemeOptions* options); -bool ffParseWMThemeCommandOptions(FFWMThemeOptions* options, const char* key, const char* value); void ffDestroyWMThemeOptions(FFWMThemeOptions* options); -void ffParseWMThemeJsonObject(FFWMThemeOptions* options, yyjson_val* module); -void ffGenerateWMThemeJsonResult(FFWMThemeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); -void ffPrintWMthemeHelpFormat(void);