Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59a80b5e authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: do not call check_conf() for olddefconfig 



check_conf() traverses the menu tree, but it is completely no-op for
olddefconfig because the following if-else block does nothing.

    if (input_mode == listnewconfig) {
            ...
    } else if (input_mode != olddefconfig) {
            ...
    }

As the help message says, olddefconfig automatically sets new symbols
to their default value.  There is no room for manual intervention.
So, calling check_conf() for olddefconfig is odd in the first place.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
parent f467c564

scripts/kconfig/conf.c

+5 −5
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void check_conf(struct menu *menu) 
				if (sym->name && !sym_is_choice_value(sym)) {

					printf("%s%s\n", CONFIG_, sym->name);

				}

			} else if (input_mode != olddefconfig) {

			} else {

				if (!conf_cnt++)

					printf(_("*\n* Restart config...\n*\n"));

				rootEntry = menu_get_parent_menu(menu);
@@ -666,15 +666,15 @@ int main(int ac, char **av) 
		/* fall through */

	case oldconfig:

	case listnewconfig:

	case olddefconfig:

	case silentoldconfig:

		/* Update until a loop caused no more changes */

		do {

			conf_cnt = 0;

			check_conf(&rootmenu);

		} while (conf_cnt &&

			 (input_mode != listnewconfig &&

			  input_mode != olddefconfig));

		} while (conf_cnt && input_mode != listnewconfig);

		break;

	case olddefconfig:

	default:

		break;

	}