[v2,3/5] kconfig: adjust warning message for conflicting types

Commit Message

Martin Walch Oct. 3, 2013, 5:24 p.m. UTC

From: Martin Walch <[e-mail]>
Date: Thu, 3 Oct 2013 18:32:02 +0200
Subject: [PATCH v2 3/5] 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 <[e-mail]>
---
 scripts/kconfig/menu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

wang yanqing Oct. 4, 2013, 2:25 p.m. UTC | #1

On Thu, Oct 03, 2013 at 07:24:46PM +0200, Martin Walch wrote:
> From: Martin Walch <[e-mail]>
> Date: Thu, 3 Oct 2013 18:32:02 +0200
> Subject: [PATCH v2 3/5] 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 <[e-mail]>

Acked-by: Wang YanQing <[e-mail]>
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index b970101..9e69f19 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)