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

KarthikNayak · gitster · commit 1958a6eb5498 · 2015-08-03T10:24:07.000-07:00
This would remove the need of using a pointer to store refname.

Mentored-by: Christian Couder &lt;christian.couder@gmail.com&gt;
Mentored-by: Matthieu Moy &lt;matthieu.moy@grenoble-inp.fr&gt;
Signed-off-by: Karthik Nayak &lt;karthik.188@gmail.com&gt;
Reviewed-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -847,8 +847,10 @@ static struct ref_array_item new_ref_array_item(const char refname,`
`847`	`847`	`const unsigned char *objectname,`
`848`	`848`	`int flag)`
`849`	`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';`
`852`	`854`	`hashcpy(ref->objectname, objectname);`
`853`	`855`	`ref->flag = flag;`
`854`	`856`
`@@ -889,7 +891,6 @@ static int ref_filter_handler(const char refname, const struct object_id oid,`
`889`	`891`	`static void free_array_item(struct ref_array_item *item)`
`890`	`892`	`{`
`891`	`893`	`free((char *)item->symref);`
`892`		`- free(item->refname);`
`893`	`894`	`free(item);`
`894`	`895`	`}`
`895`	`896`