projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: send error messages to stderr
[carl9170fw.git]
/
config
/
symbol.c
diff --git
a/config/symbol.c
b/config/symbol.c
index c9123ed2b791ad2de18450485f11ed15984cf448..c4409ee7fee20215928cb70222c62e48f02fadd8 100644
(file)
--- a/
config/symbol.c
+++ b/
config/symbol.c
@@
-371,11
+371,13
@@
void sym_calc_value(struct symbol *sym)
sym->curr.tri = no;
return;
}
sym->curr.tri = no;
return;
}
- if (!sym_is_choice_value(sym))
- sym->flags &= ~SYMBOL_WRITE;
+ sym->flags &= ~SYMBOL_WRITE;
sym_calc_visibility(sym);
sym_calc_visibility(sym);
+ if (sym->visible != no)
+ sym->flags |= SYMBOL_WRITE;
+
/* set default if recursively called */
sym->curr = newval;
/* set default if recursively called */
sym->curr = newval;
@@
-390,7
+392,6
@@
void sym_calc_value(struct symbol *sym)
/* if the symbol is visible use the user value
* if available, otherwise try the default value
*/
/* if the symbol is visible use the user value
* if available, otherwise try the default value
*/
- sym->flags |= SYMBOL_WRITE;
if (sym_has_value(sym)) {
newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri,
sym->visible);
if (sym_has_value(sym)) {
newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri,
sym->visible);
@@
-433,12
+434,9
@@
void sym_calc_value(struct symbol *sym)
case S_STRING:
case S_HEX:
case S_INT:
case S_STRING:
case S_HEX:
case S_INT:
- if (sym->visible != no) {
- sym->flags |= SYMBOL_WRITE;
- if (sym_has_value(sym)) {
- newval.val = sym->def[S_DEF_USER].val;
- break;
- }
+ if (sym->visible != no && sym_has_value(sym)) {
+ newval.val = sym->def[S_DEF_USER].val;
+ break;
}
prop = sym_get_default_prop(sym);
if (prop) {
}
prop = sym_get_default_prop(sym);
if (prop) {
@@
-1223,7
+1221,7
@@
static struct symbol *sym_check_expr_deps(struct expr *e)
default:
break;
}
default:
break;
}
-
printf(
"Oops! How to check %d?\n", e->type);
+
fprintf(stderr,
"Oops! How to check %d?\n", e->type);
return NULL;
}
return NULL;
}