diff options
| author | Michal Marek <mmarek@suse.cz> | 2013-10-31 11:58:59 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-10-31 11:58:59 +0100 |
| commit | e125096e733e966e055ee6033169f68233f9bf9c (patch) | |
| tree | bba40ae5b4dffa80a748bf4bb9133d8f1be2a253 /scripts/kconfig/menu.c | |
| parent | 5eb1f99ea1f578ce5ce6a757a3a9795e4da8de3b (diff) | |
| parent | 00d4f8fc2c729b1baf723cacd2b5942b032b6784 (diff) | |
Merge branch 'yem/kconfig-for-next' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig
Diffstat (limited to 'scripts/kconfig/menu.c')
| -rw-r--r-- | scripts/kconfig/menu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index c1d53200c30..db1512ae30c 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/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) { |