From patchwork Thu Oct 3 17:24:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Walch X-Patchwork-Id: 2985031 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E54D09F289 for ; Thu, 3 Oct 2013 17:28:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F27B20306 for ; Thu, 3 Oct 2013 17:28:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E6342030B for ; Thu, 3 Oct 2013 17:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755034Ab3JCR16 (ORCPT ); Thu, 3 Oct 2013 13:27:58 -0400 Received: from mout.web.de ([212.227.17.11]:55092 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754531Ab3JCR0c (ORCPT ); Thu, 3 Oct 2013 13:26:32 -0400 Received: from tacticalops.localnet ([95.112.171.46]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LnBDd-1W1gOB0EI9-00hN2w for ; Thu, 03 Oct 2013 19:26:31 +0200 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 X-Provags-ID: V03:K0:dcTEViE01OkBCnjYRQ13hvT7B3jdJ9Ap7S3q4mHG4pwGD76IiIg LNYK76e4/FMs13w/2z/g1canqnPpO1/Z7EvMHVcM3TDIeW4Hz/3BE8ujrAIrtMehljwEmT4 gfK2l+9MtCE3VcieBFuGagJPw/SuS39bvU7JaQC/nzRfgL6bqhph5as7R3VEypp+ATGyXuG OkYVR6ThJlDjm1fmNUOGQ== Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Wang YanQing --- 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)