From 55b279ab096f990a5313754ca17d5b08042e8031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 17 Aug 2023 16:09:41 +0800 Subject: [PATCH] JsonConfig: remove useless checks --- src/modules/battery/battery.c | 49 ++++----- src/modules/bios/bios.c | 21 ++-- src/modules/bluetooth/bluetooth.c | 33 +++--- src/modules/board/board.c | 21 ++-- src/modules/brightness/brightness.c | 21 ++-- src/modules/chassis/chassis.c | 21 ++-- src/modules/colors/colors.c | 65 ++++++------ src/modules/command/command.c | 45 ++++---- src/modules/cpu/cpu.c | 33 +++--- src/modules/cpuusage/cpuusage.c | 21 ++-- src/modules/cursor/cursor.c | 21 ++-- src/modules/custom/custom.c | 21 ++-- src/modules/datetime/datetime.c | 21 ++-- src/modules/de/de.c | 21 ++-- src/modules/disk/disk.c | 105 +++++++++--------- src/modules/display/display.c | 65 ++++++------ src/modules/font/font.c | 21 ++-- src/modules/gamepad/gamepad.c | 21 ++-- src/modules/gpu/gpu.c | 77 +++++++------- src/modules/host/host.c | 21 ++-- src/modules/icons/icons.c | 21 ++-- src/modules/kernel/kernel.c | 21 ++-- src/modules/lm/lm.c | 21 ++-- src/modules/locale/locale.c | 21 ++-- src/modules/localip/localip.c | 135 ++++++++++++------------ src/modules/media/media.c | 21 ++-- src/modules/memory/memory.c | 21 ++-- src/modules/monitor/monitor.c | 21 ++-- src/modules/opencl/opencl.c | 21 ++-- src/modules/opengl/opengl.c | 59 +++++------ src/modules/os/os.c | 21 ++-- src/modules/packages/packages.c | 21 ++-- src/modules/player/player.c | 21 ++-- src/modules/poweradapter/poweradapter.c | 21 ++-- src/modules/processes/processes.c | 21 ++-- src/modules/publicip/publicip.c | 45 ++++---- src/modules/separator/separator.c | 27 +++-- src/modules/shell/shell.c | 21 ++-- src/modules/sound/sound.c | 53 +++++----- src/modules/swap/swap.c | 21 ++-- src/modules/terminal/terminal.c | 21 ++-- src/modules/terminalfont/terminalfont.c | 21 ++-- src/modules/terminalsize/terminalsize.c | 21 ++-- src/modules/theme/theme.c | 21 ++-- src/modules/title/title.c | 67 ++++++------ src/modules/uptime/uptime.c | 21 ++-- src/modules/users/users.c | 21 ++-- src/modules/vulkan/vulkan.c | 21 ++-- src/modules/wallpaper/wallpaper.c | 21 ++-- src/modules/weather/weather.c | 57 +++++----- src/modules/wifi/wifi.c | 21 ++-- src/modules/wm/wm.c | 21 ++-- src/modules/wmtheme/wmtheme.c | 21 ++-- 53 files changed, 777 insertions(+), 936 deletions(-) diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 9a10d4973..2161be629 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -149,34 +149,31 @@ void ffDestroyBatteryOptions(FFBatteryOptions* options) void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + #ifdef __linux__ + if (ffStrEqualsIgnCase(key, "dir")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - #ifdef __linux__ - if (ffStrEqualsIgnCase(key, "dir")) - { - ffStrbufSetS(&options.dir, yyjson_get_str(val)); - continue; - } - #endif - - if (ffStrEqualsIgnCase(key, "temp")) - { - options->temp = yyjson_get_bool(val); - continue; - } - - ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffStrbufSetS(&options.dir, yyjson_get_str(val)); + continue; } + #endif + + if (ffStrEqualsIgnCase(key, "temp")) + { + options->temp = yyjson_get_bool(val); + continue; + } + + ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index d1c9bb6f0..ee4201795 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -76,20 +76,17 @@ void ffDestroyBiosOptions(FFBiosOptions* options) void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index eed9d609b..fa8b65d51 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -103,26 +103,23 @@ void ffDestroyBluetoothOptions(FFBluetoothOptions* options) void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "showDisconnected")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "showDisconnected")) - { - options->showDisconnected = yyjson_get_bool(val); - continue; - } - - ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + options->showDisconnected = yyjson_get_bool(val); + continue; } + + ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 6ce7a847a..29a676ca8 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -72,20 +72,17 @@ void ffDestroyBoardOptions(FFBoardOptions* options) void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 4a29ae751..24d31c5df 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -101,20 +101,17 @@ void ffDestroyBrightnessOptions(FFBrightnessOptions* options) void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index baf5a9ec4..02cd3e97d 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -73,20 +73,17 @@ void ffDestroyChassisOptions(FFChassisOptions* options) void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index e1ec1a90c..488413f21 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -96,42 +96,39 @@ void ffDestroyColorsOptions(FF_MAYBE_UNUSED FFColorsOptions* options) void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffStrEqualsIgnCase(key, "symbol")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffStrEqualsIgnCase(key, "symbol")) - { - int value; - const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { - { "block", FF_COLORS_SYMBOL_BLOCK }, - { "circle", FF_COLORS_SYMBOL_CIRCLE }, - { "diamond", FF_COLORS_SYMBOL_DIAMOND }, - { "triangle", FF_COLORS_SYMBOL_TRIANGLE }, - { "square", FF_COLORS_SYMBOL_SQUARE }, - { "star", FF_COLORS_SYMBOL_STAR }, - {}, - }); - if (error) - ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error); - else - options->symbol = (FFColorsSymbol) value; - continue; - } - - if (ffStrEqualsIgnCase(key, "paddingLeft")) - { - options->paddingLeft = (uint32_t) yyjson_get_uint(val); - continue; - } - - ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + int value; + const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { + { "block", FF_COLORS_SYMBOL_BLOCK }, + { "circle", FF_COLORS_SYMBOL_CIRCLE }, + { "diamond", FF_COLORS_SYMBOL_DIAMOND }, + { "triangle", FF_COLORS_SYMBOL_TRIANGLE }, + { "square", FF_COLORS_SYMBOL_SQUARE }, + { "star", FF_COLORS_SYMBOL_STAR }, + {}, + }); + if (error) + ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error); + else + options->symbol = (FFColorsSymbol) value; + continue; } + + if (ffStrEqualsIgnCase(key, "paddingLeft")) + { + options->paddingLeft = (uint32_t) yyjson_get_uint(val); + continue; + } + + ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); } } diff --git a/src/modules/command/command.c b/src/modules/command/command.c index de25c5004..f19f1f27d 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -81,32 +81,29 @@ void ffDestroyCommandOptions(FFCommandOptions* options) void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "shell")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "shell")) - { - ffStrbufSetS(&options->shell, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "text")) - { - ffStrbufSetS(&options->text, yyjson_get_str(val)); - continue; - } - - ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffStrbufSetS(&options->shell, yyjson_get_str(val)); + continue; } + + if (ffStrEqualsIgnCase(key, "text")) + { + ffStrbufSetS(&options->text, yyjson_get_str(val)); + continue; + } + + ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 5556c2e58..00aec6ba8 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -107,26 +107,23 @@ void ffDestroyCPUOptions(FFCPUOptions* options) void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "temp")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "temp")) - { - options->temp = yyjson_get_bool(val); - continue; - } - - ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + options->temp = yyjson_get_bool(val); + continue; } + + ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 59a4ae3cc..27a53d776 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -65,20 +65,17 @@ void ffDestroyCPUUsageOptions(FFCPUUsageOptions* options) void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_CPUUSAGE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_CPUUSAGE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index a011643e3..ffe91f10f 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -73,20 +73,17 @@ void ffDestroyCursorOptions(FFCursorOptions* options) void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index f1f4a2d81..b9406dcd3 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -40,20 +40,17 @@ void ffDestroyCustomOptions(FFCustomOptions* options) void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index a89d5238a..9d6307a13 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -72,20 +72,17 @@ void ffDestroyDateTimeOptions(FFDateTimeOptions* options) void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/de/de.c b/src/modules/de/de.c index e4abefd0b..a44f437d7 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -63,20 +63,17 @@ void ffDestroyDEOptions(FFDEOptions* options) void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index a43a1537e..199779f97 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -261,62 +261,59 @@ void ffDestroyDiskOptions(FFDiskOptions* options) void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "folders")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "folders")) - { - ffStrbufSetS(&options->folders, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "showExternal")) - { - if (yyjson_get_bool(val)) - options->showTypes |= FF_DISK_TYPE_EXTERNAL_BIT; - else - options->showTypes &= ~FF_DISK_TYPE_EXTERNAL_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showHidden")) - { - if (yyjson_get_bool(val)) - options->showTypes |= FF_DISK_TYPE_HIDDEN_BIT; - else - options->showTypes &= ~FF_DISK_TYPE_HIDDEN_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showSubvolumes")) - { - if (yyjson_get_bool(val)) - options->showTypes |= FF_DISK_TYPE_SUBVOLUME_BIT; - else - options->showTypes &= ~FF_DISK_TYPE_SUBVOLUME_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showUnknown")) - { - if (yyjson_get_bool(val)) - options->showTypes |= FF_DISK_TYPE_UNKNOWN_BIT; - else - options->showTypes &= ~FF_DISK_TYPE_UNKNOWN_BIT; - continue; - } - - ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffStrbufSetS(&options->folders, yyjson_get_str(val)); + continue; } + + if (ffStrEqualsIgnCase(key, "showExternal")) + { + if (yyjson_get_bool(val)) + options->showTypes |= FF_DISK_TYPE_EXTERNAL_BIT; + else + options->showTypes &= ~FF_DISK_TYPE_EXTERNAL_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "showHidden")) + { + if (yyjson_get_bool(val)) + options->showTypes |= FF_DISK_TYPE_HIDDEN_BIT; + else + options->showTypes &= ~FF_DISK_TYPE_HIDDEN_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "showSubvolumes")) + { + if (yyjson_get_bool(val)) + options->showTypes |= FF_DISK_TYPE_SUBVOLUME_BIT; + else + options->showTypes &= ~FF_DISK_TYPE_SUBVOLUME_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "showUnknown")) + { + if (yyjson_get_bool(val)) + options->showTypes |= FF_DISK_TYPE_UNKNOWN_BIT; + else + options->showTypes &= ~FF_DISK_TYPE_UNKNOWN_BIT; + continue; + } + + ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 7c11267aa..210d6861e 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -149,42 +149,39 @@ void ffDestroyDisplayOptions(FFDisplayOptions* options) void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "compactType")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "compactType")) - { - int value; - const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { - { "none", FF_DISPLAY_COMPACT_TYPE_NONE }, - { "original", FF_DISPLAY_COMPACT_TYPE_ORIGINAL_BIT }, - { "scaled", FF_DISPLAY_COMPACT_TYPE_SCALED_BIT }, - {}, - }); - if (error) - ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); - else - options->compactType = (FFDisplayCompactType) value; - continue; - } - - if (ffStrEqualsIgnCase(key, "preciseRefreshRate")) - { - options->preciseRefreshRate = yyjson_get_bool(val); - continue; - } - - ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + int value; + const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { + { "none", FF_DISPLAY_COMPACT_TYPE_NONE }, + { "original", FF_DISPLAY_COMPACT_TYPE_ORIGINAL_BIT }, + { "scaled", FF_DISPLAY_COMPACT_TYPE_SCALED_BIT }, + {}, + }); + if (error) + ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); + else + options->compactType = (FFDisplayCompactType) value; + continue; } + + if (ffStrEqualsIgnCase(key, "preciseRefreshRate")) + { + options->preciseRefreshRate = yyjson_get_bool(val); + continue; + } + + ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/font/font.c b/src/modules/font/font.c index dee13f91b..97c77359b 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -66,20 +66,17 @@ void ffDestroyFontOptions(FFFontOptions* options) void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index e057d45c3..3691b5ac8 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -72,20 +72,17 @@ void ffDestroyGamepadOptions(FFGamepadOptions* options) void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 58c85648b..5f71779a7 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -168,48 +168,45 @@ void ffDestroyGPUOptions(FFGPUOptions* options) void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "temp")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "temp")) - { - options->temp = yyjson_get_bool(val); - continue; - } - - if (ffStrEqualsIgnCase(key, "forceVulkan")) - { - options->forceVulkan = yyjson_get_bool(val); - continue; - } - - if (ffStrEqualsIgnCase(key, "hideType")) - { - int value; - const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { - { "none", FF_GPU_TYPE_UNKNOWN }, - { "intergrated", FF_GPU_TYPE_INTEGRATED }, - { "discrete", FF_GPU_TYPE_DISCRETE }, - {}, - }); - if (error) - ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); - else - options->hideType = (FFGPUType) value; - continue; - } - - ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + options->temp = yyjson_get_bool(val); + continue; } + + if (ffStrEqualsIgnCase(key, "forceVulkan")) + { + options->forceVulkan = yyjson_get_bool(val); + continue; + } + + if (ffStrEqualsIgnCase(key, "hideType")) + { + int value; + const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { + { "none", FF_GPU_TYPE_UNKNOWN }, + { "intergrated", FF_GPU_TYPE_INTEGRATED }, + { "discrete", FF_GPU_TYPE_DISCRETE }, + {}, + }); + if (error) + ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); + else + options->hideType = (FFGPUType) value; + continue; + } + + ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/host/host.c b/src/modules/host/host.c index b7033ec0b..d281ece1b 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -88,20 +88,17 @@ void ffDestroyHostOptions(FFHostOptions* options) void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index ede179b66..aa1827a5f 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -53,20 +53,17 @@ void ffDestroyIconsOptions(FFIconsOptions* options) void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index e830debe1..bc1bd21a8 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -53,20 +53,17 @@ void ffDestroyKernelOptions(FFKernelOptions* options) void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index 3c3053e8e..afef101a0 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -72,20 +72,17 @@ void ffDestroyLMOptions(FFLMOptions* options) void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 10e00802e..4fa037b15 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -53,20 +53,17 @@ void ffDestroyLocaleOptions(FFLocaleOptions* options) void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 95ed7b256..74b61c580 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -222,77 +222,74 @@ void ffDestroyLocalIpOptions(FFLocalIpOptions* options) void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "showIpv4")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "showIpv4")) - { - if (yyjson_get_bool(val)) - options->showType |= FF_LOCALIP_TYPE_IPV4_BIT; - else - options->showType &= ~FF_LOCALIP_TYPE_IPV4_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showIpv6")) - { - if (yyjson_get_bool(val)) - options->showType |= FF_LOCALIP_TYPE_IPV6_BIT; - else - options->showType &= ~FF_LOCALIP_TYPE_IPV6_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showMac")) - { - if (yyjson_get_bool(val)) - options->showType |= FF_LOCALIP_TYPE_MAC_BIT; - else - options->showType &= ~FF_LOCALIP_TYPE_MAC_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "showLoop")) - { - if (yyjson_get_bool(val)) - options->showType |= FF_LOCALIP_TYPE_LOOP_BIT; - else - options->showType &= ~FF_LOCALIP_TYPE_LOOP_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "compact")) - { - if (yyjson_get_bool(val)) - options->showType |= FF_LOCALIP_TYPE_COMPACT_BIT; - else - options->showType &= ~FF_LOCALIP_TYPE_COMPACT_BIT; - continue; - } - - if (ffStrEqualsIgnCase(key, "namePrefix")) - { - ffStrbufSetS(&options->namePrefix, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "defaultRouteOnly")) - { - options->defaultRouteOnly = yyjson_get_bool(val); - continue; - } - - ffPrintError(FF_LOCALIP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + if (yyjson_get_bool(val)) + options->showType |= FF_LOCALIP_TYPE_IPV4_BIT; + else + options->showType &= ~FF_LOCALIP_TYPE_IPV4_BIT; + continue; } + + if (ffStrEqualsIgnCase(key, "showIpv6")) + { + if (yyjson_get_bool(val)) + options->showType |= FF_LOCALIP_TYPE_IPV6_BIT; + else + options->showType &= ~FF_LOCALIP_TYPE_IPV6_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "showMac")) + { + if (yyjson_get_bool(val)) + options->showType |= FF_LOCALIP_TYPE_MAC_BIT; + else + options->showType &= ~FF_LOCALIP_TYPE_MAC_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "showLoop")) + { + if (yyjson_get_bool(val)) + options->showType |= FF_LOCALIP_TYPE_LOOP_BIT; + else + options->showType &= ~FF_LOCALIP_TYPE_LOOP_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "compact")) + { + if (yyjson_get_bool(val)) + options->showType |= FF_LOCALIP_TYPE_COMPACT_BIT; + else + options->showType &= ~FF_LOCALIP_TYPE_COMPACT_BIT; + continue; + } + + if (ffStrEqualsIgnCase(key, "namePrefix")) + { + ffStrbufSetS(&options->namePrefix, yyjson_get_str(val)); + continue; + } + + if (ffStrEqualsIgnCase(key, "defaultRouteOnly")) + { + options->defaultRouteOnly = yyjson_get_bool(val); + continue; + } + + ffPrintError(FF_LOCALIP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 10fcd66ff..87b9b7f12 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -128,20 +128,17 @@ void ffDestroyMediaOptions(FFMediaOptions* options) void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index b5691e17e..e19f61f59 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -87,20 +87,17 @@ void ffDestroyMemoryOptions(FFMemoryOptions* options) void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 406263c71..688c62413 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -98,20 +98,17 @@ void ffDestroyMonitorOptions(FFMonitorOptions* options) void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index 0d06bd884..6194b7a0b 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -62,20 +62,17 @@ void ffDestroyOpenCLOptions(FFOpenCLOptions* options) void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 94838b646..81e960de9 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -82,39 +82,36 @@ void ffDestroyOpenGLOptions(FFOpenGLOptions* options) void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + #if defined(__linux__) || defined(__FreeBSD__) + if (ffStrEqualsIgnCase(key, "library")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - #if defined(__linux__) || defined(__FreeBSD__) - if (ffStrEqualsIgnCase(key, "library")) - { - int value; - const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { - { "auto", FF_OPENGL_LIBRARY_AUTO }, - { "egl", FF_OPENGL_LIBRARY_EGL }, - { "glx", FF_OPENGL_LIBRARY_GLX }, - { "osmesa", FF_OPENGL_LIBRARY_OSMESA }, - {}, - }); - if (error) - ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); - else - options->library = (FFOpenGLLibrary) value; - continue; - } - #endif - - ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + int value; + const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { + { "auto", FF_OPENGL_LIBRARY_AUTO }, + { "egl", FF_OPENGL_LIBRARY_EGL }, + { "glx", FF_OPENGL_LIBRARY_GLX }, + { "osmesa", FF_OPENGL_LIBRARY_OSMESA }, + {}, + }); + if (error) + ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); + else + options->library = (FFOpenGLLibrary) value; + continue; } + #endif + + ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/os/os.c b/src/modules/os/os.c index b0e9ac1fb..e5e5d58ee 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -160,20 +160,17 @@ void ffDestroyOSOptions(FFOSOptions* options) void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 6d9374f19..21599e07a 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -120,20 +120,17 @@ void ffDestroyPackagesOptions(FFPackagesOptions* options) void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/player/player.c b/src/modules/player/player.c index cca9a240f..4dca65916 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -96,20 +96,17 @@ void ffDestroyPlayerOptions(FFPlayerOptions* options) void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_PLAYER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_PLAYER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index c3babafbd..7fcd772af 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -86,20 +86,17 @@ void ffDestroyPowerAdapterOptions(FFPowerAdapterOptions* options) void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_POWERADAPTER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_POWERADAPTER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index b759184c2..fa2fc89bd 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -54,20 +54,17 @@ void ffDestroyProcessesOptions(FFProcessesOptions* options) void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 3c71b9b68..3dbbc287c 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -129,32 +129,29 @@ void ffDestroyPublicIpOptions(FFPublicIpOptions* options) void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "url")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "url")) - { - ffStrbufSetS(&options->url, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "timeout")) - { - options->timeout = (uint32_t) yyjson_get_uint(val); - continue; - } - - ffPrintError(FF_PUBLICIP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffStrbufSetS(&options->url, yyjson_get_str(val)); + continue; } + + if (ffStrEqualsIgnCase(key, "timeout")) + { + options->timeout = (uint32_t) yyjson_get_uint(val); + continue; + } + + ffPrintError(FF_PUBLICIP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index dd860a3b0..0eaceff6a 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -102,23 +102,20 @@ void ffDestroySeparatorOptions(FFSeparatorOptions* options) void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffStrEqualsIgnCase(key, "string")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffStrEqualsIgnCase(key, "string")) - { - ffStrbufSetS(&options->string, yyjson_get_str(val)); - continue; - } - - ffPrintErrorString(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + ffStrbufSetS(&options->string, yyjson_get_str(val)); + continue; } + + ffPrintErrorString(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); } } diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index b9c7a4dae..d7e2cfa6d 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -66,20 +66,17 @@ void ffDestroyShellOptions(FFShellOptions* options) void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index f206c2b18..707556360 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -119,36 +119,33 @@ void ffDestroySoundOptions(FFSoundOptions* options) void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "soundType")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "soundType")) - { - int value; - const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { - { "main", FF_SOUND_TYPE_MAIN }, - { "active", FF_SOUND_TYPE_ACTIVE }, - { "all", FF_SOUND_TYPE_ALL }, - {}, - }); - if (error) - ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); - else - options->soundType = (FFSoundType) value; - continue; - } - - ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + int value; + const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { + { "main", FF_SOUND_TYPE_MAIN }, + { "active", FF_SOUND_TYPE_ACTIVE }, + { "all", FF_SOUND_TYPE_ALL }, + {}, + }); + if (error) + ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error); + else + options->soundType = (FFSoundType) value; + continue; } + + ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index aa1b1b9a1..be23eefec 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -94,20 +94,17 @@ void ffDestroySwapOptions(FFSwapOptions* options) void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 2cba2e302..5afa31c19 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -67,20 +67,17 @@ void ffDestroyTerminalOptions(FFTerminalOptions* options) void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index f0bb786c4..755fc302d 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -70,20 +70,17 @@ void ffDestroyTerminalFontOptions(FFTerminalFontOptions* options) void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_TERMINALFONT_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_TERMINALFONT_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 0f10f2c6c..f1ad620bc 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -62,20 +62,17 @@ void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options) void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_TERMINALSIZE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_TERMINALSIZE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index e54b33ed6..025e2c78f 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -53,20 +53,17 @@ void ffDestroyThemeOptions(FFThemeOptions* options) void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/title/title.c b/src/modules/title/title.c index b0730cab4..8374cd10b 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -103,43 +103,40 @@ void ffDestroyTitleOptions(FFTitleOptions* options) void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "fqdn")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "fqdn")) - { - options->fqdn = yyjson_get_bool(val); - continue; - } - - if (ffStrEqualsIgnCase(key, "color")) - { - if (!yyjson_is_obj(val)) - continue; - - yyjson_val* color = yyjson_obj_get(val, "user"); - if (color) - ffOptionParseColor(yyjson_get_str(color), &options->colorUser); - color = yyjson_obj_get(val, "at"); - if (color) - ffOptionParseColor(yyjson_get_str(color), &options->colorAt); - color = yyjson_obj_get(val, "host"); - if (color) - ffOptionParseColor(yyjson_get_str(color), &options->colorHost); - continue; - } - - ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + options->fqdn = yyjson_get_bool(val); + continue; } + + if (ffStrEqualsIgnCase(key, "color")) + { + if (!yyjson_is_obj(val)) + continue; + + yyjson_val* color = yyjson_obj_get(val, "user"); + if (color) + ffOptionParseColor(yyjson_get_str(color), &options->colorUser); + color = yyjson_obj_get(val, "at"); + if (color) + ffOptionParseColor(yyjson_get_str(color), &options->colorAt); + color = yyjson_obj_get(val, "host"); + if (color) + ffOptionParseColor(yyjson_get_str(color), &options->colorHost); + continue; + } + + ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); } } diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 9f96b6d16..1574209e0 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -102,20 +102,17 @@ void ffDestroyUptimeOptions(FFUptimeOptions* options) void ffParseUptimeJsonObject(FFUptimeOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 242566a0c..0c1263620 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -66,20 +66,17 @@ void ffDestroyUsersOptions(FFUsersOptions* options) void ffParseUsersJsonObject(FFUsersOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_USERS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_USERS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index d24c82d04..bb66ae604 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -66,20 +66,17 @@ void ffDestroyVulkanOptions(FFVulkanOptions* options) void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 03128c48c..e51ba590a 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -65,20 +65,17 @@ void ffDestroyWallpaperOptions(FFWallpaperOptions* options) void ffParseWallpaperJsonObject(FFWallpaperOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 61e0bdeaa..8ed45a624 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -100,38 +100,35 @@ void ffDestroyWeatherOptions(FFWeatherOptions* options) void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; + + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; + + if (ffStrEqualsIgnCase(key, "location")) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; - - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; - - if (ffStrEqualsIgnCase(key, "location")) - { - ffStrbufSetS(&options->location, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "outputFormat")) - { - ffStrbufSetS(&options->outputFormat, yyjson_get_str(val)); - continue; - } - - if (ffStrEqualsIgnCase(key, "timeout")) - { - options->timeout = (uint32_t) yyjson_get_uint(val); - continue; - } - - ffPrintError(FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffStrbufSetS(&options->location, yyjson_get_str(val)); + continue; } + + if (ffStrEqualsIgnCase(key, "outputFormat")) + { + ffStrbufSetS(&options->outputFormat, yyjson_get_str(val)); + continue; + } + + if (ffStrEqualsIgnCase(key, "timeout")) + { + options->timeout = (uint32_t) yyjson_get_uint(val); + continue; + } + + ffPrintError(FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 608ab86b0..afa026917 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -93,20 +93,17 @@ void ffDestroyWifiOptions(FFWifiOptions* options) void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 101d93d7b..f02efbf4e 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -64,20 +64,17 @@ void ffDestroyWMOptions(FFWMOptions* options) void ffParseWMJsonObject(FFWMOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_WM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_WM_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 9a4edb19f..438e7f832 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -53,20 +53,17 @@ void ffDestroyWMThemeOptions(FFWMThemeOptions* options) void ffParseWMThemeJsonObject(FFWMThemeOptions* options, yyjson_val* module) { - if (module) + yyjson_val *key_, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key_, val) { - yyjson_val *key_, *val; - size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) - { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) - continue; + const char* key = yyjson_get_str(key_); + if(ffStrEqualsIgnCase(key, "type")) + continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) - continue; + if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) + continue; - ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); - } + ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } }