diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index e8bdc5ca9..2434ddad0 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -12,34 +12,37 @@ #include #include -bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* moduleArgs) +bool ffJsonConfigParseModuleArgs(yyjson_val* key, yyjson_val* val, FFModuleArgs* moduleArgs) { - if(ffStrEqualsIgnCase(key, "key")) + if (unsafe_yyjson_equals_str(key, "type") || unsafe_yyjson_equals_str(key, "condition")) + return true; + + if (unsafe_yyjson_equals_str(key, "key")) { ffStrbufSetJsonVal(&moduleArgs->key, val); return true; } - else if(ffStrEqualsIgnCase(key, "format")) + else if (unsafe_yyjson_equals_str(key, "format")) { ffStrbufSetJsonVal(&moduleArgs->outputFormat, val); return true; } - else if(ffStrEqualsIgnCase(key, "outputColor")) + else if (unsafe_yyjson_equals_str(key, "outputColor")) { ffOptionParseColor(yyjson_get_str(val), &moduleArgs->outputColor); return true; } - else if(ffStrEqualsIgnCase(key, "keyColor")) + else if (unsafe_yyjson_equals_str(key, "keyColor")) { ffOptionParseColor(yyjson_get_str(val), &moduleArgs->keyColor); return true; } - else if(ffStrEqualsIgnCase(key, "keyWidth")) + else if (unsafe_yyjson_equals_str(key, "keyWidth")) { moduleArgs->keyWidth = (uint32_t) yyjson_get_uint(val); return true; } - else if(ffStrEqualsIgnCase(key, "keyIcon")) + else if (unsafe_yyjson_equals_str(key, "keyIcon")) { ffStrbufSetJsonVal(&moduleArgs->keyIcon, val); return true; diff --git a/src/common/jsonconfig.h b/src/common/jsonconfig.h index 12182855a..90df7262b 100644 --- a/src/common/jsonconfig.h +++ b/src/common/jsonconfig.h @@ -2,7 +2,7 @@ #include "fastfetch.h" -bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* moduleArgs); +bool ffJsonConfigParseModuleArgs(yyjson_val* key, yyjson_val* val, FFModuleArgs* moduleArgs); const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[]); void ffPrintJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc); void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* defaultModuleArgs, FFModuleArgs* moduleArgs); diff --git a/src/common/percent.c b/src/common/percent.c index 98c5acc64..98e3ff218 100644 --- a/src/common/percent.c +++ b/src/common/percent.c @@ -261,14 +261,14 @@ bool ffPercentParseCommandOptions(const char* key, const char* subkey, const cha return false; } -bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFPercentageModuleConfig* config) +bool ffPercentParseJsonObject(yyjson_val* key, yyjson_val* value, FFPercentageModuleConfig* config) { - if (!ffStrEqualsIgnCase(key, "percent")) + if (!unsafe_yyjson_equals_str(key, "percent")) return false; if (!yyjson_is_obj(value)) { - fprintf(stderr, "Error: usage: %s must be an object\n", key); + fprintf(stderr, "Error: usage: %s must be an object\n", unsafe_yyjson_get_str(key)); exit(480); } diff --git a/src/common/percent.h b/src/common/percent.h index 7341b7ba0..b1b1bdc7e 100644 --- a/src/common/percent.h +++ b/src/common/percent.h @@ -40,6 +40,6 @@ typedef struct yyjson_val yyjson_val; typedef struct yyjson_mut_doc yyjson_mut_doc; typedef struct yyjson_mut_val yyjson_mut_val; bool ffPercentParseCommandOptions(const char* key, const char* subkey, const char* value, FFPercentageModuleConfig* config); -bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFPercentageModuleConfig* config); +bool ffPercentParseJsonObject(yyjson_val* key, yyjson_val* value, FFPercentageModuleConfig* config); void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFPercentageModuleConfig defaultConfig, FFPercentageModuleConfig config); const char* ffPercentParseTypeJsonConfig(yyjson_val* value, FFPercentageTypeFlags* result); diff --git a/src/common/temps.c b/src/common/temps.c index 3e1e59c54..c07a2aed0 100644 --- a/src/common/temps.c +++ b/src/common/temps.c @@ -107,9 +107,9 @@ bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* return false; } -bool ffTempsParseJsonObject(const char* key, yyjson_val* value, bool* useTemp, FFColorRangeConfig* config) +bool ffTempsParseJsonObject(yyjson_val* key, yyjson_val* value, bool* useTemp, FFColorRangeConfig* config) { - if (!ffStrEqualsIgnCase(key, "temp")) + if (!unsafe_yyjson_equals_str(key, "temp")) return false; if (yyjson_is_bool(value)) @@ -126,7 +126,7 @@ bool ffTempsParseJsonObject(const char* key, yyjson_val* value, bool* useTemp, F if (!yyjson_is_obj(value)) { - fprintf(stderr, "Error: usage: %s must be an object or a boolean\n", key); + fprintf(stderr, "Error: usage: %s must be an object or a boolean\n", unsafe_yyjson_get_str(key)); exit(480); } diff --git a/src/common/temps.h b/src/common/temps.h index 2236713d2..5aa8f6bf3 100644 --- a/src/common/temps.h +++ b/src/common/temps.h @@ -5,5 +5,5 @@ void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module); bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* value, bool* useTemp, FFColorRangeConfig* config); -bool ffTempsParseJsonObject(const char* key, yyjson_val* value, bool* useTemp, FFColorRangeConfig* config); +bool ffTempsParseJsonObject(yyjson_val* key, yyjson_val* value, bool* useTemp, FFColorRangeConfig* config); void ffTempsGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FF_MAYBE_UNUSED bool defaultTemp, FFColorRangeConfig defaultConfig, bool temp, FFColorRangeConfig config); diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index f1afddbb1..ae8be7486 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -185,19 +185,15 @@ bool ffParseBatteryCommandOptions(FFBatteryOptions* options, const char* key, co void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; #ifdef _WIN32 - if (ffStrEqualsIgnCase(key, "useSetupApi")) + if (unsafe_yyjson_equals_str(key, "useSetupApi")) { options->useSetupApi = yyjson_get_bool(val); continue; @@ -210,7 +206,7 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index b8a3b0cc3..f07a441f8 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -87,18 +87,14 @@ bool ffParseBiosCommandOptions(FFBiosOptions* options, const char* key, const ch void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index b93178556..3433c3ef6 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -118,18 +118,14 @@ bool ffParseBluetoothCommandOptions(FFBluetoothOptions* options, const char* key void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "showDisconnected")) + if (unsafe_yyjson_equals_str(key, "showDisconnected")) { options->showDisconnected = yyjson_get_bool(val); continue; @@ -138,7 +134,7 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index 771296bde..93e52f686 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -117,18 +117,14 @@ bool ffParseBluetoothRadioCommandOptions(FFBluetoothRadioOptions* options, const void ffParseBluetoothRadioJsonObject(FFBluetoothRadioOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_BLUETOOTHRADIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BLUETOOTHRADIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/board/board.c b/src/modules/board/board.c index a539aa9bf..0f226e2d8 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -62,18 +62,14 @@ bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index 601420bc5..01a2279d6 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -62,18 +62,14 @@ bool ffParseBootmgrCommandOptions(FFBootmgrOptions* options, const char* key, co void ffParseBootmgrJsonObject(FFBootmgrOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/break/break.c b/src/modules/break/break.c index 6e3379ee0..39a47c0d4 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -15,6 +15,15 @@ bool ffParseBreakCommandOptions(FF_MAYBE_UNUSED FFBreakOptions* options, FF_MAYB void ffParseBreakJsonObject(FF_MAYBE_UNUSED FFBreakOptions* options, FF_MAYBE_UNUSED yyjson_val* module) { + yyjson_val *key, *val; + size_t idx, max; + yyjson_obj_foreach(module, idx, max, key, val) + { + if (unsafe_yyjson_equals_str(key, "type") || unsafe_yyjson_equals_str(key, "condition")) + continue; + + ffPrintError(FF_BREAK_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); + } } static FFModuleBaseInfo ffModuleInfo = { diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index bcbd81364..cd73a4dee 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -139,24 +139,20 @@ bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* k void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "ddcciSleep")) + if (unsafe_yyjson_equals_str(key, "ddcciSleep")) { options->ddcciSleep = (uint32_t) yyjson_get_uint(val); continue; } - if (ffStrEqualsIgnCase(key, "compact")) + if (unsafe_yyjson_equals_str(key, "compact")) { options->compact = (uint32_t) yyjson_get_bool(val); continue; @@ -165,7 +161,7 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index 31b58e1f3..2eb78e12a 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -145,21 +145,17 @@ bool ffParseBtrfsCommandOptions(FFBtrfsOptions* options, const char* key, const void ffParseBtrfsJsonObject(FFBtrfsOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 48d450f49..515df46c8 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -79,18 +79,14 @@ bool ffParseCameraCommandOptions(FFCameraOptions* options, const char* key, cons void ffParseCameraJsonObject(FFCameraOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_CAMERA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CAMERA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index 5d7ef9239..e9c4056ad 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -63,18 +63,14 @@ bool ffParseChassisCommandOptions(FFChassisOptions* options, const char* key, co void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 7d4367b39..bad4666da 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -176,18 +176,14 @@ bool ffParseColorsCommandOptions(FFColorsOptions* options, const char* key, cons void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "symbol")) + if (unsafe_yyjson_equals_str(key, "symbol")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -201,22 +197,22 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->symbol = (FFColorsSymbol) value; continue; } - if (ffStrEqualsIgnCase(key, "paddingLeft")) + if (unsafe_yyjson_equals_str(key, "paddingLeft")) { options->paddingLeft = (uint32_t) yyjson_get_uint(val); continue; } - if (ffStrEqualsIgnCase(key, "block")) + if (unsafe_yyjson_equals_str(key, "block")) { if (!yyjson_is_obj(val)) - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", key); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", unsafe_yyjson_get_str(key)); else { yyjson_val* width = yyjson_obj_get(val, "width"); @@ -227,15 +223,15 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) if (range) { if (!yyjson_is_arr(range) || yyjson_arr_size(range) != 2) - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", key); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", unsafe_yyjson_get_str(key)); else { uint8_t start = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 0)); uint8_t end = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 1)); if (start > end) - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", key); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", unsafe_yyjson_get_str(key)); else if (end > 15) - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", key); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", unsafe_yyjson_get_str(key)); else { options->block.range[0] = start; @@ -247,7 +243,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) continue; } - ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 971a2a77c..99ade943c 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -73,36 +73,32 @@ bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, co void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "shell")) + if (unsafe_yyjson_equals_str(key, "shell")) { ffStrbufSetJsonVal(&options->shell, val); continue; } - if (ffStrEqualsIgnCase(key, "param")) + if (unsafe_yyjson_equals_str(key, "param")) { ffStrbufSetJsonVal(&options->param, val); continue; } - if (ffStrEqualsIgnCase(key, "text")) + if (unsafe_yyjson_equals_str(key, "text")) { ffStrbufSetJsonVal(&options->text, val); continue; } - ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 2511a6b04..3d44657c3 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -138,33 +138,29 @@ bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig)) continue; - if (ffStrEqualsIgnCase(key, "freqNdigits")) + if (unsafe_yyjson_equals_str(key, "freqNdigits")) { ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "modules.CPU.freqNdigits has been moved to display.freq.ndigits"); continue; } - if (ffStrEqualsIgnCase(key, "showPeCoreCount")) + if (unsafe_yyjson_equals_str(key, "showPeCoreCount")) { options->showPeCoreCount = yyjson_get_bool(val); continue; } - ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index 64eaa0612..71bf5b465 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -150,24 +150,20 @@ bool ffParseCPUCacheCommandOptions(FFCPUCacheOptions* options, const char* key, void ffParseCPUCacheJsonObject(FFCPUCacheOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "compact")) + if (unsafe_yyjson_equals_str(key, "compact")) { options->compact = yyjson_get_bool(val); continue; } - ffPrintError(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 6d15261eb..ab78e456f 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -143,24 +143,20 @@ bool ffParseCPUUsageCommandOptions(FFCPUUsageOptions* options, const char* key, void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "separate")) + if (unsafe_yyjson_equals_str(key, "separate")) { options->separate = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "waitTime")) + if (unsafe_yyjson_equals_str(key, "waitTime")) { options->waitTime = (uint32_t) yyjson_get_uint(val); continue; @@ -169,7 +165,7 @@ void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_CPUUSAGE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CPUUSAGE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 9652398b5..80f101f11 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -60,18 +60,14 @@ bool ffParseCursorCommandOptions(FFCursorOptions* options, const char* key, cons void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index b0f317574..70c67e76d 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -29,18 +29,14 @@ void ffGenerateCustomJsonConfig(FFCustomOptions* options, yyjson_mut_doc* doc, y void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index 06bca8d60..9d7ca2651 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -129,18 +129,14 @@ bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/de/de.c b/src/modules/de/de.c index 341e03e2c..d0e290090 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -60,24 +60,20 @@ bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "slowVersionDetection")) + if (unsafe_yyjson_equals_str(key, "slowVersionDetection")) { options->slowVersionDetection = yyjson_get_bool(val); continue; } - ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 3d308babf..14b4754ec 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -299,36 +299,32 @@ bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const ch void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "folders")) + if (unsafe_yyjson_equals_str(key, "folders")) { ffStrbufSetJsonVal(&options->folders, val); continue; } - if (ffStrEqualsIgnCase(key, "hideFolders")) + if (unsafe_yyjson_equals_str(key, "hideFolders")) { ffStrbufSetJsonVal(&options->hideFolders, val); continue; } - if (ffStrEqualsIgnCase(key, "hideFS")) + if (unsafe_yyjson_equals_str(key, "hideFS")) { ffStrbufSetJsonVal(&options->hideFS, val); continue; } - if (ffStrEqualsIgnCase(key, "showExternal")) + if (unsafe_yyjson_equals_str(key, "showExternal")) { if (yyjson_get_bool(val)) options->showTypes |= FF_DISK_VOLUME_TYPE_EXTERNAL_BIT; @@ -337,7 +333,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showHidden")) + if (unsafe_yyjson_equals_str(key, "showHidden")) { if (yyjson_get_bool(val)) options->showTypes |= FF_DISK_VOLUME_TYPE_HIDDEN_BIT; @@ -346,7 +342,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showSubvolumes")) + if (unsafe_yyjson_equals_str(key, "showSubvolumes")) { if (yyjson_get_bool(val)) options->showTypes |= FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT; @@ -355,7 +351,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showReadOnly")) + if (unsafe_yyjson_equals_str(key, "showReadOnly")) { if (yyjson_get_bool(val)) options->showTypes |= FF_DISK_VOLUME_TYPE_READONLY_BIT; @@ -364,7 +360,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showUnknown")) + if (unsafe_yyjson_equals_str(key, "showUnknown")) { if (yyjson_get_bool(val)) options->showTypes |= FF_DISK_VOLUME_TYPE_UNKNOWN_BIT; @@ -373,7 +369,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "useAvailable")) + if (unsafe_yyjson_equals_str(key, "useAvailable")) { if (yyjson_get_bool(val)) options->calcType = FF_DISK_CALC_TYPE_AVAILABLE; @@ -385,7 +381,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index f80bbfc28..f5f805d0e 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -125,36 +125,32 @@ bool ffParseDiskIOCommandOptions(FFDiskIOOptions* options, const char* key, cons void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "namePrefix")) + if (unsafe_yyjson_equals_str(key, "namePrefix")) { ffStrbufSetJsonVal(&options->namePrefix, val); continue; } - if (ffStrEqualsIgnCase(key, "detectTotal")) + if (unsafe_yyjson_equals_str(key, "detectTotal")) { options->detectTotal = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "waitTime")) + if (unsafe_yyjson_equals_str(key, "waitTime")) { options->waitTime = (uint32_t) yyjson_get_uint(val); continue; } - ffPrintError(FF_DISKIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DISKIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 437bc79f6..914af6ca6 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -259,18 +259,14 @@ bool ffParseDisplayCommandOptions(FFDisplayOptions* options, const char* key, co void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "compactType")) + if (unsafe_yyjson_equals_str(key, "compactType")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -282,19 +278,19 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->compactType = (FFDisplayCompactType) value; continue; } - if (ffStrEqualsIgnCase(key, "preciseRefreshRate")) + if (unsafe_yyjson_equals_str(key, "preciseRefreshRate")) { options->preciseRefreshRate = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "order")) + if (unsafe_yyjson_equals_str(key, "order")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -304,13 +300,13 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->order = (FFDisplayOrder) value; continue; } - ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index fc330a2f3..246006eab 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -80,18 +80,14 @@ bool ffParseDNSCommandOptions(FFDNSOptions* options, const char* key, const char void ffParseDNSJsonObject(FFDNSOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "showType")) + if (unsafe_yyjson_equals_str(key, "showType")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -101,13 +97,13 @@ void ffParseDNSJsonObject(FFDNSOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_DNS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error); + ffPrintError(FF_DNS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->showType = (FFDNSShowType) value; continue; } - ffPrintError(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 42ff06a5e..4baa02352 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -66,18 +66,14 @@ bool ffParseEditorCommandOptions(FFEditorOptions* options, const char* key, cons void ffParseEditorJsonObject(FFEditorOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 8efd244ca..3829901e2 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -53,18 +53,14 @@ bool ffParseFontCommandOptions(FFFontOptions* options, const char* key, const ch void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 3bcc4f6f9..f3f9b37ae 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -92,21 +92,17 @@ bool ffParseGamepadCommandOptions(FFGamepadOptions* options, const char* key, co void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index f2f5806c7..06098e9e5 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -251,27 +251,23 @@ bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig)) continue; - if (ffStrEqualsIgnCase(key, "driverSpecific")) + if (unsafe_yyjson_equals_str(key, "driverSpecific")) { options->driverSpecific = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "detectionMethod")) + if (unsafe_yyjson_equals_str(key, "detectionMethod")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -283,13 +279,13 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->detectionMethod = (FFGPUDetectionMethod) value; continue; } - if (ffStrEqualsIgnCase(key, "hideType")) + if (unsafe_yyjson_equals_str(key, "hideType")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -300,7 +296,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->hideType = (FFGPUType) value; continue; @@ -309,7 +305,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 609521f77..7d9a68f62 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -79,18 +79,14 @@ bool ffParseHostCommandOptions(FFHostOptions* options, const char* key, const ch void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index 3c0dd98db..a708e6c2c 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -55,18 +55,14 @@ bool ffParseIconsCommandOptions(FFIconsOptions* options, const char* key, const void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index 38b8ece01..99669aaab 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -60,18 +60,14 @@ bool ffParseInitSystemCommandOptions(FFInitSystemOptions* options, const char* k void ffParseInitSystemJsonObject(FFInitSystemOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index d747e6752..421ebab03 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -44,18 +44,14 @@ bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, cons void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index e48e533df..35b4f5d86 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -60,18 +60,14 @@ bool ffParseKeyboardCommandOptions(FFKeyboardOptions* options, const char* key, void ffParseKeyboardJsonObject(FFKeyboardOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_KEYBOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_KEYBOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index 5dc29dd3b..4cdb42a70 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -59,18 +59,14 @@ bool ffParseLMCommandOptions(FFLMOptions* options, const char* key, const char* void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 2a02f935a..afd443cfd 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -117,24 +117,20 @@ bool ffParseLoadavgCommandOptions(FFLoadavgOptions* options, const char* key, co void ffParseLoadavgJsonObject(FFLoadavgOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "ndigits")) + if (unsafe_yyjson_equals_str(key, "ndigits")) { options->ndigits = (uint8_t) yyjson_get_uint(val); continue; } - if (ffStrEqualsIgnCase(key, "compact")) + if (unsafe_yyjson_equals_str(key, "compact")) { options->compact = yyjson_get_bool(val); continue; @@ -143,7 +139,7 @@ void ffParseLoadavgJsonObject(FFLoadavgOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index ba82b3235..04e7d9159 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -40,18 +40,14 @@ bool ffParseLocaleCommandOptions(FFLocaleOptions* options, const char* key, cons void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 308991367..16680c690 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -295,18 +295,14 @@ bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, co void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "showIpv4")) + if (unsafe_yyjson_equals_str(key, "showIpv4")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_IPV4_BIT; @@ -315,7 +311,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showIpv6")) + if (unsafe_yyjson_equals_str(key, "showIpv6")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_IPV6_BIT; @@ -324,7 +320,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showMac")) + if (unsafe_yyjson_equals_str(key, "showMac")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_MAC_BIT; @@ -333,7 +329,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showLoop")) + if (unsafe_yyjson_equals_str(key, "showLoop")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_LOOP_BIT; @@ -342,7 +338,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showPrefixLen")) + if (unsafe_yyjson_equals_str(key, "showPrefixLen")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_PREFIX_LEN_BIT; @@ -351,7 +347,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showMtu")) + if (unsafe_yyjson_equals_str(key, "showMtu")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_MTU_BIT; @@ -360,7 +356,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showSpeed")) + if (unsafe_yyjson_equals_str(key, "showSpeed")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_SPEED_BIT; @@ -369,7 +365,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showFlags")) + if (unsafe_yyjson_equals_str(key, "showFlags")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_FLAGS_BIT; @@ -378,7 +374,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "compact")) + if (unsafe_yyjson_equals_str(key, "compact")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_COMPACT_BIT; @@ -387,7 +383,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "defaultRouteOnly")) + if (unsafe_yyjson_equals_str(key, "defaultRouteOnly")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_DEFAULT_ROUTE_ONLY_BIT; @@ -396,7 +392,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "showAllIps")) + if (unsafe_yyjson_equals_str(key, "showAllIps")) { if (yyjson_get_bool(val)) options->showType |= FF_LOCALIP_TYPE_ALL_IPS_BIT; @@ -405,13 +401,13 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "namePrefix")) + if (unsafe_yyjson_equals_str(key, "namePrefix")) { ffStrbufSetJsonVal(&options->namePrefix, val); continue; } - ffPrintError(FF_LOCALIP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_LOCALIP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 08e446e54..d52a9f3c8 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -118,18 +118,14 @@ bool ffParseMediaCommandOptions(FFMediaOptions* options, const char* key, const void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index deac7ef91..711fbae0d 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -86,21 +86,17 @@ bool ffParseMemoryCommandOptions(FFMemoryOptions* options, const char* key, cons void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index afaab6a27..526bde08c 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -98,18 +98,14 @@ bool ffParseMonitorCommandOptions(FFMonitorOptions* options, const char* key, co void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index 58a7cfcf0..e7207bcfe 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -60,18 +60,14 @@ bool ffParseMouseCommandOptions(FFMouseOptions* options, const char* key, const void ffParseMouseJsonObject(FFMouseOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_MOUSE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_MOUSE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index f2182c84a..6980f8bd0 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -139,42 +139,38 @@ bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "namePrefix")) + if (unsafe_yyjson_equals_str(key, "namePrefix")) { ffStrbufSetJsonVal(&options->namePrefix, val); continue; } - if (ffStrEqualsIgnCase(key, "defaultRouteOnly")) + if (unsafe_yyjson_equals_str(key, "defaultRouteOnly")) { options->defaultRouteOnly = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "detectTotal")) + if (unsafe_yyjson_equals_str(key, "detectTotal")) { options->detectTotal = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "waitTime")) + if (unsafe_yyjson_equals_str(key, "waitTime")) { options->waitTime = (uint32_t) yyjson_get_uint(val); continue; } - ffPrintError(FF_NETIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_NETIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index dd32e9c4a..8a5cd5879 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -42,18 +42,14 @@ bool ffParseOpenCLCommandOptions(FFOpenCLOptions* options, const char* key, cons void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 4dcebcdba..a83e8d9c0 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -66,18 +66,14 @@ bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, cons void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "library")) + if (unsafe_yyjson_equals_str(key, "library")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -87,13 +83,13 @@ void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->library = (FFOpenGLLibrary) value; continue; } - ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 566af9414..c2e17e837 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -127,18 +127,14 @@ bool ffParseOSCommandOptions(FFOSOptions* options, const char* key, const char* void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 9bccb292b..917aea944 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -318,22 +318,18 @@ bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if (ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "disabled")) + if (unsafe_yyjson_equals_str(key, "disabled")) { if (!yyjson_is_null(val) && !yyjson_is_arr(val)) { - ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", key); + ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", unsafe_yyjson_get_str(key)); continue; } @@ -347,7 +343,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { if (!yyjson_is_str(flagObj)) { - ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", key); + ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", unsafe_yyjson_get_str(key)); continue; } const char* flag = unsafe_yyjson_get_str(flagObj); @@ -427,13 +423,13 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) } } - if (ffStrEqualsIgnCase(key, "combined")) + if (unsafe_yyjson_equals_str(key, "combined")) { options->combined = yyjson_get_bool(val); continue; } - ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index 9479ccba4..53ca43a27 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -154,18 +154,14 @@ bool ffParsePhysicalDiskCommandOptions(FFPhysicalDiskOptions* options, const cha void ffParsePhysicalDiskJsonObject(FFPhysicalDiskOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "namePrefix")) + if (unsafe_yyjson_equals_str(key, "namePrefix")) { ffStrbufSetJsonVal(&options->namePrefix, val); continue; @@ -174,7 +170,7 @@ void ffParsePhysicalDiskJsonObject(FFPhysicalDiskOptions* options, yyjson_val* m if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig)) continue; - ffPrintError(FF_PHYSICALDISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PHYSICALDISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 4bfe28ef4..340bc551e 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -92,18 +92,14 @@ bool ffParsePhysicalMemoryCommandOptions(FFPhysicalMemoryOptions* options, const void ffParsePhysicalMemoryJsonObject(FFPhysicalMemoryOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_PHYSICALMEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PHYSICALMEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/player/player.c b/src/modules/player/player.c index cf9a1b314..6d6dea813 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -93,18 +93,14 @@ bool ffParsePlayerCommandOptions(FFPlayerOptions* options, const char* key, cons void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_PLAYER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PLAYER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index ee8a61342..de2a36e39 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -76,18 +76,14 @@ void ffGeneratePowerAdapterJsonConfig(FFPowerAdapterOptions* options, yyjson_mut void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_POWERADAPTER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_POWERADAPTER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index 6839642ee..bf272e97d 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -41,18 +41,14 @@ bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index dd75fed09..16bdfd6ac 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -69,36 +69,32 @@ bool ffParsePublicIpCommandOptions(FFPublicIpOptions* options, const char* key, void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "url")) + if (unsafe_yyjson_equals_str(key, "url")) { ffStrbufSetJsonVal(&options->url, val); continue; } - if (ffStrEqualsIgnCase(key, "timeout")) + if (unsafe_yyjson_equals_str(key, "timeout")) { options->timeout = (uint32_t) yyjson_get_uint(val); continue; } - if (ffStrEqualsIgnCase(key, "ipv6")) + if (unsafe_yyjson_equals_str(key, "ipv6")) { options->ipv6 = yyjson_get_bool(val); continue; } - ffPrintError(FF_PUBLICIP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_PUBLICIP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index c48eaaf46..16171ac50 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -142,33 +142,32 @@ bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) + if (unsafe_yyjson_equals_str(key, "type") || unsafe_yyjson_equals_str(key, "condition")) continue; - if (ffStrEqualsIgnCase(key, "string")) + if (unsafe_yyjson_equals_str(key, "string")) { ffStrbufSetJsonVal(&options->string, val); continue; } - if (ffStrEndsWithIgnCase(key, "outputColor")) + if (unsafe_yyjson_equals_str(key, "outputColor")) { ffOptionParseColor(yyjson_get_str(val), &options->outputColor); continue; } - if (ffStrEndsWithIgnCase(key, "length")) + if (unsafe_yyjson_equals_str(key, "length")) { options->length = (uint32_t) yyjson_get_uint(val); continue; } - ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index f68cb399d..58853696e 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -54,18 +54,14 @@ bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index f57ebb091..008671d1a 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -138,18 +138,14 @@ bool ffParseSoundCommandOptions(FFSoundOptions* options, const char* key, const void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "soundType")) + if (unsafe_yyjson_equals_str(key, "soundType")) { int value; const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) { @@ -159,7 +155,7 @@ void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) {}, }); if (error) - ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error); + ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error); else options->soundType = (FFSoundType) value; continue; @@ -168,7 +164,7 @@ void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index fb3072f44..45aa00683 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -152,27 +152,23 @@ bool ffParseSwapCommandOptions(FFSwapOptions* options, const char* key, const ch void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - if (ffStrEqualsIgnCase(key, "separate")) + if (unsafe_yyjson_equals_str(key, "separate")) { options->separate = yyjson_get_bool(val); continue; } - ffPrintError(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index dc01af2db..852fe43e3 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -50,18 +50,14 @@ bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 219b8fa72..9949ab533 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -58,18 +58,14 @@ bool ffParseTerminalFontCommandOptions(FFTerminalFontOptions* options, const cha void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_TERMINALFONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_TERMINALFONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 389f4d6f0..e89155b42 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -50,18 +50,14 @@ bool ffParseTerminalSizeCommandOptions(FFTerminalSizeOptions* options, const cha void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_TERMINALSIZE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_TERMINALSIZE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index 25834d66e..a0f561fa1 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -55,18 +55,14 @@ bool ffParseTerminalThemeCommandOptions(FFTerminalThemeOptions* options, const c void ffParseTerminalThemeJsonObject(FFTerminalThemeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index e99a21779..48975e5c9 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -55,18 +55,14 @@ bool ffParseThemeCommandOptions(FFThemeOptions* options, const char* key, const void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/title/title.c b/src/modules/title/title.c index 02afec2ce..3f033d856 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -104,24 +104,20 @@ bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "fqdn")) + if (unsafe_yyjson_equals_str(key, "fqdn")) { options->fqdn = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "color")) + if (unsafe_yyjson_equals_str(key, "color")) { if (!yyjson_is_obj(val)) continue; @@ -138,7 +134,7 @@ void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) continue; } - ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key); + ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index 9d849671a..64df1ff66 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -50,18 +50,14 @@ bool ffParseTPMCommandOptions(FFTPMOptions* options, const char* key, const char void ffParseTPMJsonObject(FFTPMOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_TPM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_TPM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 74d985f85..224725ed7 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -68,18 +68,14 @@ bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, cons void ffParseUptimeJsonObject(FFUptimeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 9ba72977b..435c35ac1 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -131,30 +131,29 @@ bool ffParseUsersCommandOptions(FFUsersOptions* options, const char* key, const void ffParseUsersJsonObject(FFUsersOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if (ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) + if (unsafe_yyjson_equals_str(key, "type") || unsafe_yyjson_equals_str(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "compact")) + if (unsafe_yyjson_equals_str(key, "compact")) { options->compact = yyjson_get_bool(val); continue; } - if (ffStrEqualsIgnCase(key, "myselfOnly")) + if (unsafe_yyjson_equals_str(key, "myselfOnly")) { options->myselfOnly = yyjson_get_bool(val); continue; } - ffPrintError(FF_USERS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_USERS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 426cbc3d2..d7db250b5 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -56,18 +56,14 @@ bool ffParseVersionCommandOptions(FFVersionOptions* options, const char* key, co void ffParseVersionJsonObject(FFVersionOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_VERSION_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_VERSION_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index d67ca9e70..f74c15c34 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -62,18 +62,14 @@ bool ffParseVulkanCommandOptions(FFVulkanOptions* options, const char* key, cons void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index bd95a4d0e..997c2473a 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -52,18 +52,14 @@ bool ffParseWallpaperCommandOptions(FFWallpaperOptions* options, const char* key void ffParseWallpaperJsonObject(FFWallpaperOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_WALLPAPER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 9d37ed0e7..03761d391 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -59,36 +59,32 @@ bool ffParseWeatherCommandOptions(FFWeatherOptions* options, const char* key, co void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "location")) + if (unsafe_yyjson_equals_str(key, "location")) { ffStrbufSetJsonVal(&options->location, val); continue; } - if (ffStrEqualsIgnCase(key, "outputFormat")) + if (unsafe_yyjson_equals_str(key, "outputFormat")) { ffStrbufSetJsonVal(&options->outputFormat, val); continue; } - if (ffStrEqualsIgnCase(key, "timeout")) + if (unsafe_yyjson_equals_str(key, "timeout")) { options->timeout = (uint32_t) yyjson_get_uint(val); continue; } - ffPrintError(FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_WEATHER_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index c7038a0fc..6f52c0271 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -151,21 +151,17 @@ bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const ch void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 5dc413563..cb3a64232 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -81,24 +81,20 @@ bool ffParseWMCommandOptions(FFWMOptions* options, const char* key, const char* void ffParseWMJsonObject(FFWMOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - if (ffStrEqualsIgnCase(key, "detectPlugin")) + if (unsafe_yyjson_equals_str(key, "detectPlugin")) { options->detectPlugin = yyjson_get_bool(val); continue; } - ffPrintError(FF_WM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_WM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 6659d88e1..a3830dace 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -41,18 +41,14 @@ bool ffParseWMThemeCommandOptions(FFWMThemeOptions* options, const char* key, co void ffParseWMThemeJsonObject(FFWMThemeOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; - ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_WMTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } } diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index 151836f0b..ba110a607 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -122,21 +122,17 @@ bool ffParseZpoolCommandOptions(FFZpoolOptions* options, const char* key, const void ffParseZpoolJsonObject(FFZpoolOptions* options, yyjson_val* module) { - yyjson_val *key_, *val; + yyjson_val *key, *val; size_t idx, max; - yyjson_obj_foreach(module, idx, max, key_, val) + yyjson_obj_foreach(module, idx, max, key, val) { - const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) - continue; - if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) continue; if (ffPercentParseJsonObject(key, val, &options->percent)) continue; - ffPrintError(FF_ZPOOL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key); + ffPrintError(FF_ZPOOL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key)); } }