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

use alloc_ref rather than hand-allocating "struct ref"

Browse Source 
This saves us some manual computation, and eliminates a call
to strcpy.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-09-24 17:08:09 -04:00 committed by Junio C Hamano
parent cbc8feeaf9
commit 6f687c21c0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fetch.c
View File

@ -639,8 +639,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
continue; continue;
if (rm->peer_ref) { if (rm->peer_ref) {
ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); ref = alloc_ref(rm->peer_ref->name);
strcpy(ref->name, rm->peer_ref->name);
hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
hashcpy(ref->new_sha1, rm->old_sha1); hashcpy(ref->new_sha1, rm->old_sha1);
ref->force = rm->peer_ref->force; ref->force = rm->peer_ref->force;

5
remote-curl.c
View File

@ -168,10 +168,7 @@ static struct ref *parse_info_refs(struct discovery *heads)
url.buf); url.buf);
data[i] = 0; data[i] = 0;
ref_name = mid + 1; ref_name = mid + 1;
ref = xmalloc(sizeof(struct ref) + ref = alloc_ref(ref_name);
strlen(ref_name) + 1);
memset(ref, 0, sizeof(struct ref));
strcpy(ref->name, ref_name);
get_sha1_hex(start, ref->old_sha1); get_sha1_hex(start, ref->old_sha1);
if (!refs) if (!refs)
refs = ref; refs = ref;