projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: Rename menu_check_dep() to rewrite_m()
[carl9170fw.git]
/
config
/
menu.c
diff --git
a/config/menu.c
b/config/menu.c
index ce88de89f146e3ce1c6d980130ff93bae1b992ce..912c77645583423784ca4dbe30a1bd8abe4ae80f 100644
(file)
--- a/
config/menu.c
+++ b/
config/menu.c
@@
-79,19
+79,23
@@
void menu_end_menu(void)
current_menu = current_menu->parent;
}
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:
{
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:
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 */
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)
{
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)
}
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->menu = current_entry;
prop->expr = expr;
- prop->visible.expr =
menu_check_dep
(dep);
+ prop->visible.expr =
rewrite_m
(dep);
if (prompt) {
if (isspace(*prompt)) {
if (prompt) {
if (isspace(*prompt)) {