]> www.infradead.org Git - nvme.git/commitdiff
kconfig: refactor conf_write_defconfig() to reduce indentation level
authorMasahiro Yamada <masahiroy@kernel.org>
Sun, 2 Jun 2024 12:54:16 +0000 (21:54 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Mon, 15 Jul 2024 16:08:36 +0000 (01:08 +0900)
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>
scripts/kconfig/confdata.c

index 25c327ae3c5ca42e055b08838ab146c43789f296..1ac7fc9ad756fd023362aefc6bf2f6c2aa98dcd3 100644 (file)
@@ -774,34 +774,31 @@ int conf_write_defconfig(const char *filename)
                struct menu *choice;
 
                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 symbol is a choice value and equals to the
-                        * default for a choice - skip.
-                        */
-                       choice = sym_get_choice_menu(sym);
-                       if (choice) {
-                               struct symbol *ds;
+               if (!sym || sym_is_choice(sym))
+                       continue;
 
-                               ds = sym_choice_default(choice->sym);
-                               if (sym == ds) {
-                                       if (sym_get_tristate_value(sym) == yes)
-                                               continue;
-                               }
-                       }
-                       print_symbol_for_dotconfig(out, sym);
+               sym_calc_value(sym);
+               if (!(sym->flags & SYMBOL_WRITE))
+                       continue;
+               sym->flags &= ~SYMBOL_WRITE;
+               /* Skip unchangeable symbols */
+               if (!sym_is_changeable(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);
        return 0;