[PATCH v8 11/11] 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>
---
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 a1151e0..43502a4 100644
--- 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)
{
- 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;
@@ -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);
- free(item->refname);
free(item);
}
diff --git a/ref-filter.h b/ref-filter.h
index 697b609..6997984 100644
--- 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;
- char *refname;
+ char refname[FLEX_ARRAY];
};
struct ref_array {
--
2.4.3.435.g2403634.dirty
Karthik Nayak <karthik.188@gmail.com>