From patchwork Fri Mar 2 07:05:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130486 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp959635lja; Thu, 1 Mar 2018 23:06:46 -0800 (PST) X-Google-Smtp-Source: AG47ELuSjPDcRe3c/sMj9RHoe4DKhZTNaU5TxPlnsEDFhy/6NJPVANc1RTg4ZeD9df8k8pk0iKDI X-Received: by 10.101.81.135 with SMTP id h7mr3856358pgq.121.1519974406158; Thu, 01 Mar 2018 23:06:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519974406; cv=none; d=google.com; s=arc-20160816; b=SQY3N04nC8KJPeCxzMn+uZV5UZK17WsRt2bSf6wV2j7LwBwNqfLcCwZ40QkwihhK+Z ULcp5RVQlD/BrwPGmA9l+97k6Cya+dpRMzlxxwIOAl1XdhbqMVwmzcod1QWpukekJYRt +1eaCDKecj/WNFOeJYBGMst1kL2Rl989HDPgNQf/GyYwnbcpVN5wzZ8AXNQfK/vCcoOJ GFQt7QbILEcEg20CWojj5ferFi5adBHw0lSjMpMRWQm6ELV4l0u5S9q11UU8/zyupKs5 v/PobCND41oJBxdkyot06vQhGDOf1cKB0hqC0ezldRbOSp9nqQ3Hx/oMiiL7hK+9MMql uVbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=CNcv7y4fn95E4dvFTQQqWH5r3nJ+udiyx90tW4oxPe8=; b=XBZUNNm6czj5ZMk96Uw5IRZse2hNKunqWwlwHrH0IIPzUrIGJCv/HcQZAql/2xw/Yl e1r19KqVJBv7cPvCvgtgtNbSimQ7GY1wplc3Y+vIAeHfZ6D4l46lQMwOJuQMFYA8Twlj 1bg2n3Z1m64PdyO1mIKK4DptuXPqBhMVtDgvYs83aiqg80pj7HG1xnSjXBYvfRkHSOZG Mznz0mjNa+2a1gPW2q80BZ6oQg4wQfJxo87U7hbXgwIRpQma/yx/icNCXyAgYmE7vVW/ HxxLovhNJbKe4ntHO8E3Eg7cN/5XpzAZpdG+eV3c1DqOj+ndyTUgncxNl2wDHBQAS6S3 OUlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=IkIezCEk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r69si3588488pgr.678.2018.03.01.23.06.45; Thu, 01 Mar 2018 23:06:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=IkIezCEk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936132AbeCBHGl (ORCPT + 28 others); Fri, 2 Mar 2018 02:06:41 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:55173 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932927AbeCBHGk (ORCPT ); Fri, 2 Mar 2018 02:06:40 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w2275GSq020139; Fri, 2 Mar 2018 16:05:16 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w2275GSq020139 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519974317; bh=CNcv7y4fn95E4dvFTQQqWH5r3nJ+udiyx90tW4oxPe8=; h=From:To:Cc:Subject:Date:From; b=IkIezCEkdftlUwgPYgGyV433lxDOTpiroocRMwun3osNW8tu87yMoFXj+pnzP/x6G TY/kBkCD462f/QGK48ynlGOjebeFGRGySDujoZ+pFBRkrBKFwzUt28ieMB8vNyWVtQ 5jAIJ4FSif8thsuM+w576aNpwPmF+sgcIxRXmHEzjPEEg/mw95PR51Ux/rOUqlrdAn Xf8MdP+KYivWUhZj6ZZR2kqFD1eUZqqENu1tL1jwKUKISGqRxlfLc48MX35RwxIkpM u14BhOzaxzNObMnmJD7mZw21HgHMcx0EBeL0q86gQ3Zox3eByU2M58QrmWggPSjT7m 8pBCGJ6y9SZEw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Ulf Magnusson , Randy Dunlap , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: fix line number in recursive inclusion error message Date: Fri, 2 Mar 2018 16:05:12 +0900 Message-Id: <1519974312-20477-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When recursive inclusion is detected, the line number of the last 'included from:' is wrong. [Test Case] Kconfig: -------->8-------- source "Kconfig2" -------->8-------- Kconfig2: -------->8-------- source "Kconfig3" -------->8-------- Kconfig3: -------->8-------- source "Kconfig" -------->8-------- [Result] $ make allyesconfig scripts/kconfig/conf --allyesconfig Kconfig Kconfig:1: recursive inclusion detected. Inclusion path: current file : 'Kconfig' included from: 'Kconfig3:1' included from: 'Kconfig2:1' included from: 'Kconfig:3' scripts/kconfig/Makefile:89: recipe for target 'allyesconfig' failed make[1]: *** [allyesconfig] Error 1 Makefile:512: recipe for target 'allyesconfig' failed make: *** [allyesconfig] Error 2 where we expect current file : 'Kconfig' included from: 'Kconfig3:1' included from: 'Kconfig2:1' included from: 'Kconfig:1' The 'iter->lineno+1' in the second fpinrtf() should be 'iter->lineno-1'. I refactored the code to merge two fprintf(). Signed-off-by: Masahiro Yamada --- scripts/kconfig/zconf.l | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 2.7.4 Reviewed-by: Ulf Magnusson diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 02de6fe..88b650e 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -332,16 +332,12 @@ void zconf_nextfile(const char *name) "Inclusion path:\n current file : '%s'\n", zconf_curname(), zconf_lineno(), zconf_curname()); - iter = current_file->parent; - while (iter && \ - strcmp(iter->name,current_file->name)) { - fprintf(stderr, " included from: '%s:%d'\n", - iter->name, iter->lineno-1); + iter = current_file; + do { iter = iter->parent; - } - if (iter) fprintf(stderr, " included from: '%s:%d'\n", - iter->name, iter->lineno+1); + iter->name, iter->lineno - 1); + } while (strcmp(iter->name, current_file->name)); exit(1); } }