diff mbox series

[02/27] kconfig: fix off-by-one in zconf_error()

Message ID	20240202155825.314567-3-masahiroy@kernel.org (mailing list archive)
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FE5C1482E3; Fri, 2 Feb 2024 15:58:32 +0000 (UTC) From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH 02/27] kconfig: fix off-by-one in zconf_error() Date: Sat, 3 Feb 2024 00:58:00 +0900 Message-Id: <20240202155825.314567-3-masahiroy@kernel.org> In-Reply-To: <20240202155825.314567-1-masahiroy@kernel.org> References: <20240202155825.314567-1-masahiroy@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	kconfig: refactor lexer and parser code \| expand [00/27] kconfig: refactor lexer and parser code [01/27] kconfig: fix infinite loop when expanding a macro at the end of file [02/27] kconfig: fix off-by-one in zconf_error() [03/27] kconfig: remove orphan lookup_file() declaration [04/27] kconfig: remove compat_getline() [05/27] kconfig: remove unneeded sym_find() call in conf_parse() [06/27] kconfig: write Kconfig files to autoconf.cmd in order [07/27] kconfig: call env_write_dep() right after yyparse() [08/27] kconfig: split preprocessor prototypes into preprocess.h [09/27] kconfig: replace current_pos with separate cur_{filename,lineno} [10/27] kconfig: remove zconf_curname() and zconf_lineno() [11/27] kconfig: associate struct menu with file name directly [12/27] kconfig: associate struct property with file name directly [13/27] kconfig: replace file->name with name in zconf_nextfile() [14/27] kconfig: do not delay the cur_filename update [15/27] kconfig: replace remaining current_file->name with cur_filename [16/27] kconfig: move the file and lineno in struct file to struct buffer [17/27] kconfig: make file::name a flexible array member [18/27] kconfig: change file_lookup() to return the file name [19/27] kconfig: split list_head into a separate header [20/27] kconfig: resync list.h [21/27] kconfig: import more list macros and inline functions [22/27] kconfig: add macros useful for hashtable [23/27] kconfig: move ARRAY_SIZE to a header [24/27] kconfig: move strhash() to a header [25/27] kconfig: convert linked list of files to hash table [26/27] kconfig: use generic macros to implement symbol hashtable [27/27] kconfig: do not imply the type of choice value

Commit Message

Masahiro Yamada Feb. 2, 2024, 3:58 p.m. UTC

yyerror() reports the line number of the next line.

This +1 adjustment was introduced more than 20 years ago [1]. At that
time, the line number was decremented then incremented back and forth.

The line number management was refactored in a more maintainable way.
Such compensation is no longer needed.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=d4f8a4530eb07a1385fd17b0e62a7dce97486f49

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/kconfig/parser.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index 2af7ce4e1531..5ab2e3f7ca33 100644
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -557,7 +557,7 @@  static void zconf_error(const char *err, ...)
 
 static void yyerror(const char *err)
 {
-	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno(), err);
 }
 
 static void print_quoted_string(FILE *out, const char *str)