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

Add allocation and freeing functions for struct refs

Browse Source 
Instead of open-coding allocation wherever it happens, have a function.
Also, add a function to free a list of refs, which we currently never
actually do.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2007-07-10 00:47:23 -04:00 committed by Junio C Hamano
parent 54dadbdb29
commit dfd255dd1a
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -72,7 +72,7 @@ struct ref **get_remote_heads(int in, struct ref **list,
continue; continue;
if (nr_match && !path_match(name, nr_match, match)) if (nr_match && !path_match(name, nr_match, match))
continue; continue;
ref = xcalloc(1, sizeof(*ref) + len - 40); ref = alloc_ref(len - 40);
hashcpy(ref->old_sha1, old_sha1); hashcpy(ref->old_sha1, old_sha1);
memcpy(ref->name, buffer + 41, len - 40); memcpy(ref->name, buffer + 41, len - 40);
*list = ref; *list = ref;

25
remote.c
View File

@ -320,6 +320,25 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec)
return -1; return -1;
} }
struct ref *alloc_ref(unsigned namelen)
{
struct ref *ret = xmalloc(sizeof(struct ref) + namelen);
memset(ret, 0, sizeof(struct ref) + namelen);
return ret;
}
void free_refs(struct ref *ref)
{
struct ref *next;
while (ref) {
next = ref->next;
if (ref->peer_ref)
free(ref->peer_ref);
free(ref);
ref = next;
}
}
static int count_refspec_match(const char *pattern, static int count_refspec_match(const char *pattern,
struct ref *refs, struct ref *refs,
struct ref **matched_ref) struct ref **matched_ref)
@ -391,7 +410,7 @@ static struct ref *try_explicit_object_name(const char *name)
int len; int len;
if (!*name) { if (!*name) {
ref = xcalloc(1, sizeof(*ref) + 20); ref = alloc_ref(20);
strcpy(ref->name, "(delete)"); strcpy(ref->name, "(delete)");
hashclr(ref->new_sha1); hashclr(ref->new_sha1);
return ref; return ref;
@ -399,7 +418,7 @@ static struct ref *try_explicit_object_name(const char *name)
if (get_sha1(name, sha1)) if (get_sha1(name, sha1))
return NULL; return NULL;
len = strlen(name) + 1; len = strlen(name) + 1;
ref = xcalloc(1, sizeof(*ref) + len); ref = alloc_ref(len);
memcpy(ref->name, name, len); memcpy(ref->name, name, len);
hashcpy(ref->new_sha1, sha1); hashcpy(ref->new_sha1, sha1);
return ref; return ref;
@ -411,7 +430,7 @@ static struct ref *make_dst(const char *name, struct ref ***dst_tail)
size_t len; size_t len;
len = strlen(name) + 1; len = strlen(name) + 1;
dst = xcalloc(1, sizeof(*dst) + len); dst = alloc_ref(len);
memcpy(dst->name, name, len); memcpy(dst->name, name, len);
link_dst_tail(dst, dst_tail); link_dst_tail(dst, dst_tail);
return dst; return dst;

7
remote.h
View File

@ -30,6 +30,13 @@ struct refspec {
char *dst; char *dst;
}; };
struct ref *alloc_ref(unsigned namelen);
/*
* Frees the entire list and peers of elements.
*/
void free_refs(struct ref *ref);
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail, int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
int nr_refspec, char **refspec, int all); int nr_refspec, char **refspec, int all);