kconfig: refactor conf_write_defconfig() to reduce indentation level
Reduce the indentation level by continue'ing the loop earlier if (!sym || sym_is_choice(sym)). No functional change intended. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
This commit is contained in:
parent
826ee96dd4
commit
995150e4de
@ -774,34 +774,31 @@ int conf_write_defconfig(const char *filename)
|
|||||||
struct menu *choice;
|
struct menu *choice;
|
||||||
|
|
||||||
sym = menu->sym;
|
sym = menu->sym;
|
||||||
if (sym && !sym_is_choice(sym)) {
|
|
||||||
sym_calc_value(sym);
|
|
||||||
if (!(sym->flags & SYMBOL_WRITE))
|
|
||||||
continue;
|
|
||||||
sym->flags &= ~SYMBOL_WRITE;
|
|
||||||
/* If we cannot change the symbol - skip */
|
|
||||||
if (!sym_is_changeable(sym))
|
|
||||||
continue;
|
|
||||||
/* If symbol equals to default value - skip */
|
|
||||||
if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/*
|
if (!sym || sym_is_choice(sym))
|
||||||
* If symbol is a choice value and equals to the
|
continue;
|
||||||
* default for a choice - skip.
|
|
||||||
*/
|
|
||||||
choice = sym_get_choice_menu(sym);
|
|
||||||
if (choice) {
|
|
||||||
struct symbol *ds;
|
|
||||||
|
|
||||||
ds = sym_choice_default(choice->sym);
|
sym_calc_value(sym);
|
||||||
if (sym == ds) {
|
if (!(sym->flags & SYMBOL_WRITE))
|
||||||
if (sym_get_tristate_value(sym) == yes)
|
continue;
|
||||||
continue;
|
sym->flags &= ~SYMBOL_WRITE;
|
||||||
}
|
/* Skip unchangeable symbols */
|
||||||
}
|
if (!sym_is_changeable(sym))
|
||||||
print_symbol_for_dotconfig(out, sym);
|
continue;
|
||||||
|
/* Skip symbols that are equal to the default */
|
||||||
|
if (!strcmp(sym_get_string_value(sym), sym_get_string_default(sym)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Skip choice values that are equal to the default */
|
||||||
|
choice = sym_get_choice_menu(sym);
|
||||||
|
if (choice) {
|
||||||
|
struct symbol *ds;
|
||||||
|
|
||||||
|
ds = sym_choice_default(choice->sym);
|
||||||
|
if (sym == ds && sym_get_tristate_value(sym) == yes)
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
print_symbol_for_dotconfig(out, sym);
|
||||||
}
|
}
|
||||||
fclose(out);
|
fclose(out);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user