From patchwork Wed Oct 30 21:46:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 3117201 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 240FA9F2B7 for ; Wed, 30 Oct 2013 21:47:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74BC4200E5 for ; Wed, 30 Oct 2013 21:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5F03200F4 for ; Wed, 30 Oct 2013 21:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470Ab3J3Vqa (ORCPT ); Wed, 30 Oct 2013 17:46:30 -0400 Received: from mail-we0-f180.google.com ([74.125.82.180]:58418 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803Ab3J3Vq3 (ORCPT ); Wed, 30 Oct 2013 17:46:29 -0400 Received: by mail-we0-f180.google.com with SMTP id q59so1885375wes.39 for ; Wed, 30 Oct 2013 14:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=M/utW4AGO5Mql3RWROgI3yVyWUDTLF5SCFaMMedppJI=; b=0yOoiOZ8PaZNxVDUuKFsNQraKK3SkhMZQ6HgDNk8kHjFH29LsV/d+8VVZhcZzznduw QEhF386OalLsj7i5jHuZ1wdDbkUjhXp2Q4TMWXeXmNyQKE7dnjEMxB+z/MEIx/1MA8tE ZI0aqrf39mlWrM6/XPvPU1l8ITcOAWMckmBzbLbzhKqLudtn2O1TVzXpjOw8hjQSaDT9 rljWoSWI/6eRrQl1DgPs0RGwh4BB7tpxptHRihl1+LVPcTNp+2ogZa6HdKqkr+tWyEKj niKCjnwpMkDkt6NEq4zNp7jV3mDk/+iK8/BDRGmD0NW5lC9amV2u3I7lKBTSw7MBmwiQ /2Eg== X-Received: by 10.180.231.38 with SMTP id td6mr617969wic.61.1383169588635; Wed, 30 Oct 2013 14:46:28 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ma3sm234761wic.1.2013.10.30.14.46.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Oct 2013 14:46:27 -0700 (PDT) From: "Yann E. MORIN" To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Martin Walch , "Yann E. MORIN" Subject: [PATCH 4/7] kconfig: adjust warning message for conflicting types Date: Wed, 30 Oct 2013 22:46:17 +0100 Message-Id: <57540f1dea6580fda0debaf3704d1b0e928a120e.1383168460.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, 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 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 Reviewed-by: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" --- 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)