diff options
| author | Maxime Hadjinlian <maxime.hadjinlian@gmail.com> | 2013-12-27 22:18:28 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-12-28 16:02:11 +0100 |
| commit | ebe660246303ce4ee4bf6f77726c72528e449b7b (patch) | |
| tree | 37188d31fb54b99baee7254cb1223365163049a1 /support/kconfig/menu.c | |
| parent | aa83bc88ba4c738daaf944c1b2a7d00001d05a67 (diff) | |
| download | buildroot-ebe660246303ce4ee4bf6f77726c72528e449b7b.tar.gz buildroot-ebe660246303ce4ee4bf6f77726c72528e449b7b.zip | |
support/kconfig: Update kconfig to 3.13-rc5
Only minor changes are registered, mainly help text.
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/kconfig/menu.c')
| -rw-r--r-- | support/kconfig/menu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/support/kconfig/menu.c b/support/kconfig/menu.c index c1d53200c3..db1512ae30 100644 --- a/support/kconfig/menu.c +++ b/support/kconfig/menu.c @@ -119,9 +119,10 @@ void menu_set_type(int type) sym->type = type; return; } - menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'", - sym->name ? sym->name : "<choice>", - sym_type_name(sym->type), sym_type_name(type)); + menu_warn(current_entry, + "ignoring type redefinition of '%s' from '%s' to '%s'", + sym->name ? sym->name : "<choice>", + sym_type_name(sym->type), sym_type_name(type)); } struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep) @@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, for (j = 4; --i >= 0; j += 2) { menu = submenu[i]; if (head && location && menu == location) - jump->offset = r->len - 1; + jump->offset = strlen(r->s); str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu))); if (menu->sym) { @@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, } /* - * get peoperty of type P_SYMBOL + * get property of type P_SYMBOL */ static struct property *get_symbol_prop(struct symbol *sym) { |
