From patchwork Thu Feb 13 12:57:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Walch X-Patchwork-Id: 3645251 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5885BF40C for ; Thu, 13 Feb 2014 12:57:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED363201D5 for ; Thu, 13 Feb 2014 12:57:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 124682012D for ; Thu, 13 Feb 2014 12:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754620AbaBMM51 (ORCPT ); Thu, 13 Feb 2014 07:57:27 -0500 Received: from mout.web.de ([212.227.15.3]:49724 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754527AbaBMM5X (ORCPT ); Thu, 13 Feb 2014 07:57:23 -0500 Received: from tacticalops.localnet ([95.112.149.120]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0MdLsp-1Vx5gw3xxb-00IVmB for ; Thu, 13 Feb 2014 13:57:22 +0100 From: Martin Walch To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Yann E. MORIN" Subject: [PATCH 2/2] kconfig: trivial - adjust comments Date: Thu, 13 Feb 2014 13:57:21 +0100 Message-ID: <1552040.ObFWAZURHi@tacticalops> User-Agent: KMail/4.12.2 (Linux/3.10.7-gentoo-r1-gnu; KDE/4.12.2; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:1IyFHuEh6NdgpJ9d/JRNXCIr6tsHO0SXOWUHVIz8MAbiHduMpJs 7QAp1gCxYnupZcEykLNWG/lZNppvA4oxcZNSMW75CxM8PjR74/v4Rb0PAJ+80yztS52mGXu AJefA3/bbDgyGy96aZUW2sxsMopD4QZYNCOX0EV1VzPfRQxsBBcPbSLs2TsM4nH09MiisuK 08Kpmi3O6OV65sQq2TAEQ== 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.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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, 13 Feb 2014 12:17:06 +0100 Subject: [PATCH 2/2] kconfig: trivial - adjust comments the line (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' is probably copy & paste from above, missing the adjustment done in the code. It should probably read (a!='b') && (a='c') -> 'b'='c' ? 'n' : a='c' the second case is similar: (a!='m') && (a!='n') -> (a='m') should be (a!='m') && (a!='n') -> (a='y') This patch intentionally violates the checkpatch.pl style check by keeping C99 comments: there are many of them, and consequently they all should be converted, but this is beyond the scope of this patch. Signed-off-by: Martin Walch --- scripts/kconfig/expr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index 4aa171b..4b73854 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -460,7 +460,7 @@ static struct expr *expr_join_and(struct expr *e1, struct expr *e2) : expr_alloc_symbol(&symbol_no); } if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) { - // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' + // (a!='b') && (a='c') -> 'b'='c' ? 'n' : a='c' sym2 = e2->right.sym; if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST)) return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2) @@ -481,7 +481,7 @@ static struct expr *expr_join_and(struct expr *e1, struct expr *e2) if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL && ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) || (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) - // (a!='m') && (a!='n') -> (a='m') + // (a!='m') && (a!='n') -> (a='y') return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes); if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||