diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2017-10-05 14:01:13 +0200 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-12-15 00:21:25 +0100 |
| commit | 9a826842ff2fbd200561d3c1e81ca34eab6bfbbb (patch) | |
| tree | 92e52ccc4808e912503bd17b07e476ea2c3e4123 /scripts | |
| parent | kconfig: Sync zconf.y with zconf.tab.c_shipped (diff) | |
| download | linux-9a826842ff2fbd200561d3c1e81ca34eab6bfbbb.tar.xz linux-9a826842ff2fbd200561d3c1e81ca34eab6bfbbb.zip | |
kconfig: Rename menu_check_dep() to rewrite_m()
More directly describes the only thing it does.
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/menu.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index ce88de89f146..912c77645583 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -79,19 +79,23 @@ void menu_end_menu(void) current_menu = current_menu->parent; } -static struct expr *menu_check_dep(struct expr *e) +/* + * Rewrites 'm' to 'm' && MODULES, so that it evaluates to 'n' when running + * without modules + */ +static struct expr *rewrite_m(struct expr *e) { if (!e) return e; switch (e->type) { case E_NOT: - e->left.expr = menu_check_dep(e->left.expr); + e->left.expr = rewrite_m(e->left.expr); break; case E_OR: case E_AND: - e->left.expr = menu_check_dep(e->left.expr); - e->right.expr = menu_check_dep(e->right.expr); + e->left.expr = rewrite_m(e->left.expr); + e->right.expr = rewrite_m(e->right.expr); break; case E_SYMBOL: /* change 'm' into 'm' && MODULES */ @@ -106,7 +110,7 @@ static struct expr *menu_check_dep(struct expr *e) void menu_add_dep(struct expr *dep) { - current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); + current_entry->dep = expr_alloc_and(current_entry->dep, rewrite_m(dep)); } void menu_set_type(int type) @@ -131,7 +135,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct prop->menu = current_entry; prop->expr = expr; - prop->visible.expr = menu_check_dep(dep); + prop->visible.expr = rewrite_m(dep); if (prompt) { if (isspace(*prompt)) { |