Skip to content

Commit c79b67e

Browse files
committed
Modules: don't report errors when condition key is set
1 parent 30af91c commit c79b67e

File tree

72 files changed

+72
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+72
-72
lines changed

src/modules/battery/battery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module)
186186
yyjson_obj_foreach(module, idx, max, key_, val)
187187
{
188188
const char* key = yyjson_get_str(key_);
189-
if(ffStrEqualsIgnCase(key, "type"))
189+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
190190
continue;
191191

192192
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/bios/bios.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module)
9292
yyjson_obj_foreach(module, idx, max, key_, val)
9393
{
9494
const char* key = yyjson_get_str(key_);
95-
if(ffStrEqualsIgnCase(key, "type"))
95+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
9696
continue;
9797

9898
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/bluetooth/bluetooth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module)
123123
yyjson_obj_foreach(module, idx, max, key_, val)
124124
{
125125
const char* key = yyjson_get_str(key_);
126-
if(ffStrEqualsIgnCase(key, "type"))
126+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
127127
continue;
128128

129129
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/bluetoothradio/bluetoothradio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void ffParseBluetoothRadioJsonObject(FFBluetoothRadioOptions* options, yyjson_va
122122
yyjson_obj_foreach(module, idx, max, key_, val)
123123
{
124124
const char* key = yyjson_get_str(key_);
125-
if(ffStrEqualsIgnCase(key, "type"))
125+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
126126
continue;
127127

128128
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/board/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module)
6767
yyjson_obj_foreach(module, idx, max, key_, val)
6868
{
6969
const char* key = yyjson_get_str(key_);
70-
if(ffStrEqualsIgnCase(key, "type"))
70+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
7171
continue;
7272

7373
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/bootmgr/bootmgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void ffParseBootmgrJsonObject(FFBootmgrOptions* options, yyjson_val* module)
6767
yyjson_obj_foreach(module, idx, max, key_, val)
6868
{
6969
const char* key = yyjson_get_str(key_);
70-
if(ffStrEqualsIgnCase(key, "type"))
70+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
7171
continue;
7272

7373
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/brightness/brightness.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul
144144
yyjson_obj_foreach(module, idx, max, key_, val)
145145
{
146146
const char* key = yyjson_get_str(key_);
147-
if(ffStrEqualsIgnCase(key, "type"))
147+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
148148
continue;
149149

150150
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/btrfs/btrfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void ffParseBtrfsJsonObject(FFBtrfsOptions* options, yyjson_val* module)
149149
yyjson_obj_foreach(module, idx, max, key_, val)
150150
{
151151
const char* key = yyjson_get_str(key_);
152-
if(ffStrEqualsIgnCase(key, "type"))
152+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
153153
continue;
154154

155155
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/camera/camera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void ffParseCameraJsonObject(FFCameraOptions* options, yyjson_val* module)
8484
yyjson_obj_foreach(module, idx, max, key_, val)
8585
{
8686
const char* key = yyjson_get_str(key_);
87-
if(ffStrEqualsIgnCase(key, "type"))
87+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
8888
continue;
8989

9090
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

src/modules/chassis/chassis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module)
6868
yyjson_obj_foreach(module, idx, max, key_, val)
6969
{
7070
const char* key = yyjson_get_str(key_);
71-
if(ffStrEqualsIgnCase(key, "type"))
71+
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
7272
continue;
7373

7474
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))

0 commit comments

Comments
 (0)