kconfig: make file::name a flexible array member

Call malloc() just once to allocate needed memory.

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

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 85e0d1ab3c8ad055f8e6f63e2aafbd99f8b1679a..760b1e681b4339ef6a63dd7e136c7cbac74675b3 100644 (file)
--- 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 958543bb0a37a936349be2e8c509d8fc3ab40557..2636dccea0c9a84670bf6dfcc48b14c4dcf16d80 100644 (file)
--- 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;