From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747Ab3JCR0g (ORCPT ); Thu, 3 Oct 2013 13:26:36 -0400 Received: from mout.web.de ([212.227.15.3]:53756 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754276Ab3JCR0c (ORCPT ); Thu, 3 Oct 2013 13:26:32 -0400 From: Martin Walch To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Arve =?ISO-8859-1?Q?Hj=F8nnev=E5g?= , Jiri Kosina , "Yann E. MORIN" , Benjamin Poirier , Dirk Gouders , Wang YanQing , Andrew Morton , Jean Delvare , Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] kconfig: adjust warning message for conflicting types Date: Thu, 03 Oct 2013 19:24:46 +0200 Message-ID: <5367004.amEGKp5Frc@tacticalops> User-Agent: KMail/4.11.1 (Linux/3.10.7-gentoo-r1-gnu; KDE/4.11.1; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" X-Provags-ID: V03:K0:iRpdsYzWiEzL94mgZ8smyzWN9dXOzN6wJoGqenySSxpI0JQuVMr w7bTyOLpAh/j4E3dG7jcgmmcYymDToGg0wPcopRduYKs3hD/2OvyoGVjwG1MQW7drXIAPni BZG6DLHMoO84gcmnqTptUqNgM9cz7poNybMd/NADw3xFtYjn3fXjsepsEMO3b5pujRvSUIw tKSdJxoqxk+HXJcwxkTdQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Walch 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 redefined from to 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 from to Signed-off-by: Martin Walch --- scripts/kconfig/menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 : "", - 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 : "", + 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) -- 1.8.1.5