undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Karthik Nayak 2015-06-14 01:07:29 +05:30 committed by Junio C Hamano
parent 14de7fba34
commit 1958a6eb54
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ref-filter.c
View File

@ -847,8 +847,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
const unsigned char *objectname, const unsigned char *objectname,
int flag) int flag)
{ {
struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)); size_t len = strlen(refname);
ref->refname = xstrdup(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); hashcpy(ref->objectname, objectname);
ref->flag = flag; 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) static void free_array_item(struct ref_array_item *item)
{ {
free((char *)item->symref); free((char *)item->symref);
free(item->refname);
free(item); free(item);
} }

2
ref-filter.h
View File

@ -32,7 +32,7 @@ struct ref_array_item {
int flag; int flag;
const char *symref; const char *symref;
struct atom_value *value; struct atom_value *value;
char *refname; char refname[FLEX_ARRAY];
}; };
struct ref_array { struct ref_array {