projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: make conf_unsaved a local variable of conf_read()
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index dae149812cbc44c552a556a9ea760d4f57d0231a..4dad8e5c620b1012e089f5486e491661a27fdcaf 100644
(file)
--- a/
config/zconf.y
+++ b/
config/zconf.y
@@
-431,6
+431,11
@@
help_start: T_HELP T_EOL
help: help_start T_HELPTEXT
{
help: help_start T_HELPTEXT
{
+ if (current_entry->help) {
+ free(current_entry->help);
+ zconfprint("warning: '%s' defined with more than one help text -- only the last one will be used",
+ current_entry->sym->name ?: "<choice>");
+ }
current_entry->help = $2;
};
current_entry->help = $2;
};
@@
-640,7
+645,7
@@
static void print_symbol(FILE *out, struct menu *menu)
fprintf(out, "\nconfig %s\n", sym->name);
switch (sym->type) {
case S_BOOLEAN:
fprintf(out, "\nconfig %s\n", sym->name);
switch (sym->type) {
case S_BOOLEAN:
- fputs(" bool
ean
\n", out);
+ fputs(" bool\n", out);
break;
case S_TRISTATE:
fputs(" tristate\n", out);
break;
case S_TRISTATE:
fputs(" tristate\n", out);