Commit 57540f1d authored Oct 03, 2013 by Martin Walch Committed by Yann E. MORIN Oct 08, 2013

kconfig: adjust warning message for conflicting types



Each symbol must have exactly one type assigned. However, if a symbol happens
to have two different types assigned at runtime, a warning is printed and the
first type is preserved while the second type is being ignored.

The warning message says

type of <symbol name> redefined from <first type> to <second type>

which may be misleading as it may create the impression that the second type
replaces the first type.

This patch clarifies this by changing the warning to

ignoring type redefinition of <symbol name> from <first type> to <second type>

Signed-off-by: Martin Walch <walch.martin@web.de>
Acked-by: Wang YanQing <udknight@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

parent 8d9dfe82

scripts/kconfig/menu.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -119,7 +119,8 @@ void menu_set_type(int type)
		sym->type = type;
		return;
		}
		menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
		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));
		}

Admin message