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>
Karthik Nayak committed
Jun 14, 2015 at 01:07 UTC
1958a6eb5498c8a5ac5ba908833cc862b28759f9
2 files changed
+5
-4
ref-filter.c
+4
-3
@@ -847,8 +847,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
847
const unsigned char *objectname,
848
int flag)
849
{
850
- struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));
851
- ref->refname = xstrdup(refname);
850
+ size_t len = strlen(refname);
851
+ struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1);
852
+ memcpy(ref->refname, refname, len);
853
+ ref->refname[len] = '\0';
854
hashcpy(ref->objectname, objectname);
855
ref->flag = flag;
856
@@ -889,7 +891,6 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
891
static void free_array_item(struct ref_array_item *item)
892
{
893
free((char *)item->symref);
892
- free(item->refname);
894
free(item);
895
}
896
ref-filter.h
+1
-1
@@ -32,7 +32,7 @@ struct ref_array_item {
32
int flag;
33
const char *symref;
34
struct atom_value *value;
35
- char *refname;
35
+ char refname[FLEX_ARRAY];
36
};
37
38
struct ref_array {