Skip to content

Commit 55b279a

Browse files
CarterLiCarterLi
committed
JsonConfig: remove useless checks
1 parent e5e4c8b commit 55b279a

File tree

53 files changed

+756
-915
lines changed

Some content is hidden

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

53 files changed

+756
-915
lines changed

‎src/modules/battery/battery.c‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -149,34 +149,31 @@ void ffDestroyBatteryOptions(FFBatteryOptions* options)
149149

150150
void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module)
151151
{
152-
if (module)
152+
yyjson_val *key_, *val;
153+
size_t idx, max;
154+
yyjson_obj_foreach(module, idx, max, key_, val)
153155
{
154-
yyjson_val *key_, *val;
155-
size_t idx, max;
156-
yyjson_obj_foreach(module, idx, max, key_, val)
157-
{
158-
const char* key = yyjson_get_str(key_);
159-
if(ffStrEqualsIgnCase(key, "type"))
160-
continue;
156+
const char* key = yyjson_get_str(key_);
157+
if(ffStrEqualsIgnCase(key, "type"))
158+
continue;
161159

162-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
163-
continue;
160+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
161+
continue;
164162

165-
#ifdef __linux__
166-
if (ffStrEqualsIgnCase(key, "dir"))
167-
{
168-
ffStrbufSetS(&options.dir, yyjson_get_str(val));
169-
continue;
170-
}
171-
#endif
172-
173-
if (ffStrEqualsIgnCase(key, "temp"))
174-
{
175-
options->temp = yyjson_get_bool(val);
176-
continue;
177-
}
163+
#ifdef __linux__
164+
if (ffStrEqualsIgnCase(key, "dir"))
165+
{
166+
ffStrbufSetS(&options.dir, yyjson_get_str(val));
167+
continue;
168+
}
169+
#endif
178170

179-
ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
171+
if (ffStrEqualsIgnCase(key, "temp"))
172+
{
173+
options->temp = yyjson_get_bool(val);
174+
continue;
180175
}
176+
177+
ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
181178
}
182179
}

‎src/modules/bios/bios.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,17 @@ void ffDestroyBiosOptions(FFBiosOptions* options)
7676

7777
void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module)
7878
{
79-
if (module)
79+
yyjson_val *key_, *val;
80+
size_t idx, max;
81+
yyjson_obj_foreach(module, idx, max, key_, val)
8082
{
81-
yyjson_val *key_, *val;
82-
size_t idx, max;
83-
yyjson_obj_foreach(module, idx, max, key_, val)
84-
{
85-
const char* key = yyjson_get_str(key_);
86-
if(ffStrEqualsIgnCase(key, "type"))
87-
continue;
83+
const char* key = yyjson_get_str(key_);
84+
if(ffStrEqualsIgnCase(key, "type"))
85+
continue;
8886

89-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
90-
continue;
87+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
88+
continue;
9189

92-
ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
93-
}
90+
ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
9491
}
9592
}

‎src/modules/bluetooth/bluetooth.c‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,26 +103,23 @@ void ffDestroyBluetoothOptions(FFBluetoothOptions* options)
103103

104104
void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module)
105105
{
106-
if (module)
106+
yyjson_val *key_, *val;
107+
size_t idx, max;
108+
yyjson_obj_foreach(module, idx, max, key_, val)
107109
{
108-
yyjson_val *key_, *val;
109-
size_t idx, max;
110-
yyjson_obj_foreach(module, idx, max, key_, val)
111-
{
112-
const char* key = yyjson_get_str(key_);
113-
if(ffStrEqualsIgnCase(key, "type"))
114-
continue;
110+
const char* key = yyjson_get_str(key_);
111+
if(ffStrEqualsIgnCase(key, "type"))
112+
continue;
115113

116-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
117-
continue;
114+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
115+
continue;
118116

119-
if (ffStrEqualsIgnCase(key, "showDisconnected"))
120-
{
121-
options->showDisconnected = yyjson_get_bool(val);
122-
continue;
123-
}
124-
125-
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
117+
if (ffStrEqualsIgnCase(key, "showDisconnected"))
118+
{
119+
options->showDisconnected = yyjson_get_bool(val);
120+
continue;
126121
}
122+
123+
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
127124
}
128125
}

‎src/modules/board/board.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,17 @@ void ffDestroyBoardOptions(FFBoardOptions* options)
7272

7373
void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module)
7474
{
75-
if (module)
75+
yyjson_val *key_, *val;
76+
size_t idx, max;
77+
yyjson_obj_foreach(module, idx, max, key_, val)
7678
{
77-
yyjson_val *key_, *val;
78-
size_t idx, max;
79-
yyjson_obj_foreach(module, idx, max, key_, val)
80-
{
81-
const char* key = yyjson_get_str(key_);
82-
if(ffStrEqualsIgnCase(key, "type"))
83-
continue;
79+
const char* key = yyjson_get_str(key_);
80+
if(ffStrEqualsIgnCase(key, "type"))
81+
continue;
8482

85-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
86-
continue;
83+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
84+
continue;
8785

88-
ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
89-
}
86+
ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
9087
}
9188
}

‎src/modules/brightness/brightness.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,17 @@ void ffDestroyBrightnessOptions(FFBrightnessOptions* options)
101101

102102
void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module)
103103
{
104-
if (module)
104+
yyjson_val *key_, *val;
105+
size_t idx, max;
106+
yyjson_obj_foreach(module, idx, max, key_, val)
105107
{
106-
yyjson_val *key_, *val;
107-
size_t idx, max;
108-
yyjson_obj_foreach(module, idx, max, key_, val)
109-
{
110-
const char* key = yyjson_get_str(key_);
111-
if(ffStrEqualsIgnCase(key, "type"))
112-
continue;
108+
const char* key = yyjson_get_str(key_);
109+
if(ffStrEqualsIgnCase(key, "type"))
110+
continue;
113111

114-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
115-
continue;
112+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
113+
continue;
116114

117-
ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
118-
}
115+
ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
119116
}
120117
}

‎src/modules/chassis/chassis.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,17 @@ void ffDestroyChassisOptions(FFChassisOptions* options)
7373

7474
void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module)
7575
{
76-
if (module)
76+
yyjson_val *key_, *val;
77+
size_t idx, max;
78+
yyjson_obj_foreach(module, idx, max, key_, val)
7779
{
78-
yyjson_val *key_, *val;
79-
size_t idx, max;
80-
yyjson_obj_foreach(module, idx, max, key_, val)
81-
{
82-
const char* key = yyjson_get_str(key_);
83-
if(ffStrEqualsIgnCase(key, "type"))
84-
continue;
80+
const char* key = yyjson_get_str(key_);
81+
if(ffStrEqualsIgnCase(key, "type"))
82+
continue;
8583

86-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
87-
continue;
84+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
85+
continue;
8886

89-
ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
90-
}
87+
ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
9188
}
9289
}

‎src/modules/colors/colors.c‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -96,42 +96,39 @@ void ffDestroyColorsOptions(FF_MAYBE_UNUSED FFColorsOptions* options)
9696

9797
void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module)
9898
{
99-
if (module)
99+
yyjson_val *key_, *val;
100+
size_t idx, max;
101+
yyjson_obj_foreach(module, idx, max, key_, val)
100102
{
101-
yyjson_val *key_, *val;
102-
size_t idx, max;
103-
yyjson_obj_foreach(module, idx, max, key_, val)
103+
const char* key = yyjson_get_str(key_);
104+
if(ffStrEqualsIgnCase(key, "type"))
105+
continue;
106+
107+
if (ffStrEqualsIgnCase(key, "symbol"))
104108
{
105-
const char* key = yyjson_get_str(key_);
106-
if(ffStrEqualsIgnCase(key, "type"))
107-
continue;
108-
109-
if (ffStrEqualsIgnCase(key, "symbol"))
110-
{
111-
int value;
112-
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
113-
{ "block", FF_COLORS_SYMBOL_BLOCK },
114-
{ "circle", FF_COLORS_SYMBOL_CIRCLE },
115-
{ "diamond", FF_COLORS_SYMBOL_DIAMOND },
116-
{ "triangle", FF_COLORS_SYMBOL_TRIANGLE },
117-
{ "square", FF_COLORS_SYMBOL_SQUARE },
118-
{ "star", FF_COLORS_SYMBOL_STAR },
119-
{},
120-
});
121-
if (error)
122-
ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error);
123-
else
124-
options->symbol = (FFColorsSymbol) value;
125-
continue;
126-
}
127-
128-
if (ffStrEqualsIgnCase(key, "paddingLeft"))
129-
{
130-
options->paddingLeft = (uint32_t) yyjson_get_uint(val);
131-
continue;
132-
}
133-
134-
ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
109+
int value;
110+
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
111+
{ "block", FF_COLORS_SYMBOL_BLOCK },
112+
{ "circle", FF_COLORS_SYMBOL_CIRCLE },
113+
{ "diamond", FF_COLORS_SYMBOL_DIAMOND },
114+
{ "triangle", FF_COLORS_SYMBOL_TRIANGLE },
115+
{ "square", FF_COLORS_SYMBOL_SQUARE },
116+
{ "star", FF_COLORS_SYMBOL_STAR },
117+
{},
118+
});
119+
if (error)
120+
ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error);
121+
else
122+
options->symbol = (FFColorsSymbol) value;
123+
continue;
135124
}
125+
126+
if (ffStrEqualsIgnCase(key, "paddingLeft"))
127+
{
128+
options->paddingLeft = (uint32_t) yyjson_get_uint(val);
129+
continue;
130+
}
131+
132+
ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
136133
}
137134
}

‎src/modules/command/command.c‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,29 @@ void ffDestroyCommandOptions(FFCommandOptions* options)
8181

8282
void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module)
8383
{
84-
if (module)
84+
yyjson_val *key_, *val;
85+
size_t idx, max;
86+
yyjson_obj_foreach(module, idx, max, key_, val)
8587
{
86-
yyjson_val *key_, *val;
87-
size_t idx, max;
88-
yyjson_obj_foreach(module, idx, max, key_, val)
88+
const char* key = yyjson_get_str(key_);
89+
if(ffStrEqualsIgnCase(key, "type"))
90+
continue;
91+
92+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
93+
continue;
94+
95+
if (ffStrEqualsIgnCase(key, "shell"))
96+
{
97+
ffStrbufSetS(&options->shell, yyjson_get_str(val));
98+
continue;
99+
}
100+
101+
if (ffStrEqualsIgnCase(key, "text"))
89102
{
90-
const char* key = yyjson_get_str(key_);
91-
if(ffStrEqualsIgnCase(key, "type"))
92-
continue;
93-
94-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
95-
continue;
96-
97-
if (ffStrEqualsIgnCase(key, "shell"))
98-
{
99-
ffStrbufSetS(&options->shell, yyjson_get_str(val));
100-
continue;
101-
}
102-
103-
if (ffStrEqualsIgnCase(key, "text"))
104-
{
105-
ffStrbufSetS(&options->text, yyjson_get_str(val));
106-
continue;
107-
}
108-
109-
ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
103+
ffStrbufSetS(&options->text, yyjson_get_str(val));
104+
continue;
110105
}
106+
107+
ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
111108
}
112109
}

‎src/modules/cpu/cpu.c‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,23 @@ void ffDestroyCPUOptions(FFCPUOptions* options)
107107

108108
void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module)
109109
{
110-
if (module)
110+
yyjson_val *key_, *val;
111+
size_t idx, max;
112+
yyjson_obj_foreach(module, idx, max, key_, val)
111113
{
112-
yyjson_val *key_, *val;
113-
size_t idx, max;
114-
yyjson_obj_foreach(module, idx, max, key_, val)
115-
{
116-
const char* key = yyjson_get_str(key_);
117-
if(ffStrEqualsIgnCase(key, "type"))
118-
continue;
119-
120-
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
121-
continue;
114+
const char* key = yyjson_get_str(key_);
115+
if(ffStrEqualsIgnCase(key, "type"))
116+
continue;
122117

123-
if (ffStrEqualsIgnCase(key, "temp"))
124-
{
125-
options->temp = yyjson_get_bool(val);
126-
continue;
127-
}
118+
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
119+
continue;
128120

129-
ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
121+
if (ffStrEqualsIgnCase(key, "temp"))
122+
{
123+
options->temp = yyjson_get_bool(val);
124+
continue;
130125
}
126+
127+
ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
131128
}
132129
}

0 commit comments

Comments
 (0)