ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname

This would remove the need of using a pointer to store refname.

Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 7b39303810c0e059b8d740ce208f65820a960f82..3fbbbeb88fedda6a3ae55409733df7a69df4aa27 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -847,8 +847,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
                                                 const unsigned char *objectname,
                                                 int flag)
 {
                                                 const unsigned char *objectname,
                                                 int flag)
 {

-       struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));
-       ref->refname = xstrdup(refname);
+       size_t len = strlen(refname);
+       struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1);
+       memcpy(ref->refname, refname, len);
+       ref->refname[len] = '\0';

        hashcpy(ref->objectname, objectname);
        ref->flag = flag;
 
        hashcpy(ref->objectname, objectname);
        ref->flag = flag;
 


@@ -889,7 +891,6 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
 static void free_array_item(struct ref_array_item *item)
 {
        free((char *)item->symref);
 static void free_array_item(struct ref_array_item *item)
 {
        free((char *)item->symref);

-       free(item->refname);

        free(item);
 }
 
        free(item);
 }
 

diff --git a/ref-filter.h b/ref-filter.h
index 697b609064c0ce7a3a9f52b8217acf6bdb8a3a40..699798400b329a12bc5dfa09590853a18616f876 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -32,7 +32,7 @@ struct ref_array_item {
        int flag;
        const char *symref;
        struct atom_value *value;
        int flag;
        const char *symref;
        struct atom_value *value;

-       char *refname;
+       char refname[FLEX_ARRAY];

 };
 
 struct ref_array {
 };
 
 struct ref_array {