diff mbox series

[17/27] kconfig: make file::name a flexible array member

Message ID	20240202155825.314567-18-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 BB4E214C5BF; Fri, 2 Feb 2024 15:58:49 +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 17/27] kconfig: make file::name a flexible array member Date: Sat, 3 Feb 2024 00:58:15 +0900 Message-Id: <20240202155825.314567-18-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

Call malloc() just once to allocate needed memory.

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

 scripts/kconfig/expr.h | 2 +-
 scripts/kconfig/util.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 85e0d1ab3c8a..760b1e681b43 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -19,7 +19,7 @@  extern "C" {
 
 struct file {
 	struct file *next;
-	const char *name;
+	char name[];
 };
 
 typedef enum tristate {
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 958543bb0a37..2636dccea0c9 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -13,6 +13,7 @@ 
 struct file *file_lookup(const char *name)
 {
 	struct file *file;
+	size_t len;
 
 	for (file = file_list; file; file = file->next) {
 		if (!strcmp(name, file->name)) {
@@ -20,9 +21,11 @@  struct file *file_lookup(const char *name)
 		}
 	}
 
-	file = xmalloc(sizeof(*file));
+	len = strlen(name);
+	file = xmalloc(sizeof(*file) + len + 1);
 	memset(file, 0, sizeof(*file));
-	file->name = xstrdup(name);
+	memcpy(file->name, name, len);
+	file->name[len] = '\0';
 	file->next = file_list;
 	file_list = file;