[PATCH v6 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname

[Karthik Nayak]

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

Mentored-by: Christian Couder <christian.cou...@gmail.com>
Mentored-by: Matthieu Moy <matthieu....@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
 ref-filter.c | 7 ++++---
 ref-filter.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 91a6ec9..745d3b3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -846,8 +846,10 @@ static struct ref_array_item *new_ref_array_item(const 
char *refname,
                                                 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;
 
@@ -888,7 +890,6 @@ int ref_filter_handler(const char *refname, const struct 
object_id *oid, int fla
 static void free_array_item(struct ref_array_item *item)
 {
        free(item->symref);
-       free(item->refname);
        free(item);
 }
 
diff --git a/ref-filter.h b/ref-filter.h
index 15e6766..041a39a 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -29,7 +29,7 @@ struct ref_array_item {
        int flag;
        char *symref;
        struct atom_value *value;
-       char *refname;
+       char refname[FLEX_ARRAY];
 };
 
 struct ref_array {
-- 
2.4.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html