Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kconfig: refactor conf_set_all_new_symbols() to reduce indentation level
The outer switch statement can be avoided by continue'ing earlier the
loop when the symbol type is neither S_BOOLEAN nor S_TRISTATE.
Remove it to reduce the indentation level by one. In addition, avoid
the repetition of sym->def[S_DEF_USER].tri.
No functional change intended.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
+30
-31
+30
-31
scripts/kconfig/conf.c
+30
-31
scripts/kconfig/conf.c
···
218
218
}
219
219
220
220
for_all_symbols(sym) {
221
-
if (sym_has_value(sym) || sym->flags & SYMBOL_VALID)
221
+
tristate val;
222
+
223
+
if (sym_has_value(sym) || sym->flags & SYMBOL_VALID ||
224
+
(sym->type != S_BOOLEAN && sym->type != S_TRISTATE))
222
225
continue;
223
-
switch (sym_get_type(sym)) {
224
-
case S_BOOLEAN:
225
-
case S_TRISTATE:
226
-
has_changed = true;
227
-
switch (mode) {
228
-
case def_yes:
229
-
sym->def[S_DEF_USER].tri = yes;
230
-
break;
231
-
case def_mod:
232
-
sym->def[S_DEF_USER].tri = mod;
233
-
break;
234
-
case def_no:
235
-
sym->def[S_DEF_USER].tri = no;
236
-
break;
237
-
case def_random:
238
-
sym->def[S_DEF_USER].tri = no;
239
-
cnt = rand() % 100;
240
-
if (sym->type == S_TRISTATE) {
241
-
if (cnt < pty)
242
-
sym->def[S_DEF_USER].tri = yes;
243
-
else if (cnt < pty + ptm)
244
-
sym->def[S_DEF_USER].tri = mod;
245
-
} else if (cnt < pby)
246
-
sym->def[S_DEF_USER].tri = yes;
247
-
break;
248
-
default:
249
-
continue;
226
+
227
+
has_changed = true;
228
+
switch (mode) {
229
+
case def_yes:
230
+
val = yes;
231
+
break;
232
+
case def_mod:
233
+
val = mod;
234
+
break;
235
+
case def_no:
236
+
val = no;
237
+
break;
238
+
case def_random:
239
+
val = no;
240
+
cnt = rand() % 100;
241
+
if (sym->type == S_TRISTATE) {
242
+
if (cnt < pty)
243
+
val = yes;
244
+
else if (cnt < pty + ptm)
245
+
val = mod;
246
+
} else if (cnt < pby) {
247
+
val = yes;
250
248
}
251
-
if (!(sym_is_choice(sym) && mode == def_random))
252
-
sym->flags |= SYMBOL_DEF_USER;
253
249
break;
254
250
default:
255
-
break;
251
+
continue;
256
252
}
253
+
sym->def[S_DEF_USER].tri = val;
257
254
255
+
if (!(sym_is_choice(sym) && mode == def_random))
256
+
sym->flags |= SYMBOL_DEF_USER;
258
257
}
259
258
260
259
sym_clear_all_valid();