diff options
| author |  Jeff King <peff@peff.net> | 2015-09-24 17:08:09 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 11:08:05 -0700 |
| commit | 6f687c21c07bfb83a63049640cba5fb82c174198 (patch) | |
| tree | 676902427bac01c3d0a4b3e72d19f14421c72e25 | |
| parent | color: add overflow checks for parsing colors (diff) | |
| download | tgif-6f687c21c07bfb83a63049640cba5fb82c174198.tar.xz | |
use alloc_ref rather than hand-allocating "struct ref"
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>
| -rw-r--r-- | builtin/fetch.c | 3 | ||||
| -rw-r--r-- | remote-curl.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 841880ec2c..ed84963a57 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -639,8 +639,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, continue; if (rm->peer_ref) { - ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); - strcpy(ref->name, rm->peer_ref->name); + ref = alloc_ref(rm->peer_ref->name); hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); hashcpy(ref->new_sha1, rm->old_sha1); ref->force = rm->peer_ref->force; diff --git a/remote-curl.c b/remote-curl.c index 71fbbb694f..cc7a8a66fa 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -168,10 +168,7 @@ static struct ref *parse_info_refs(struct discovery *heads) url.buf); data[i] = 0; ref_name = mid + 1; - ref = xmalloc(sizeof(struct ref) + - strlen(ref_name) + 1); - memset(ref, 0, sizeof(struct ref)); - strcpy(ref->name, ref_name); + ref = alloc_ref(ref_name); get_sha1_hex(start, ref->old_sha1); if (!refs) refs = ref; |