diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2021-02-01 07:14:11 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 09:01:21 (GMT) |
| commit | 5263bf8339a07a967f0a923d237e8a36d20439fc (patch) | |
| tree | c2f820fec1979ce69d24edb06a12d7ec989a22a5 /kconfig/menu.c | |
| parent | 30bffa96b215a16c3adc88446d3d2ecc66d4450b (diff) | |
kconfig: Sync with upstream v5.8
09d5873e4d1f kconfig: allow only 'config', 'comment', and 'if' inside 'choice'
644a4b6cecc2 kconfig: do not assign a variable in the return statement
cfc6eea9f6af kconfig: do not use OR-assignment for zero-cleared structure
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/menu.c')
| -rw-r--r-- | kconfig/menu.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kconfig/menu.c b/kconfig/menu.c index bfd7800..a5fbd6c 100644 --- a/kconfig/menu.c +++ b/kconfig/menu.c @@ -65,7 +65,8 @@ void menu_add_entry(struct symbol *sym) struct menu *menu_add_menu(void) { last_entry_ptr = ¤t_entry->list; - return current_menu = current_entry; + current_menu = current_entry; + return current_menu; } void menu_end_menu(void) @@ -157,13 +158,7 @@ struct property *menu_add_prompt(enum prop_type type, char *prompt, { struct property *prop = menu_add_prop(type, NULL, dep); - /* For crostool-NG, a leading pipe followed with spaces - * means that pipe shall be removed, and the spaces should - * not be trimmed. - */ - if (*prompt == '|') - prompt++; - else if (isspace(*prompt)) { + if (isspace(*prompt)) { prop_warn(prop, "leading whitespace ignored"); while (isspace(*prompt)) prompt++; |