Browse Source

Replace custom memory growth allocator with ALLOC_GROW

The ALLOC_GROW macro is a shorter way to implement an array that
grows upon demand as additional items are added to it.  We have
mostly standardized upon its use within git and transport.c is
not an exception.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Shawn O. Pearce 18 years ago committed by Junio C Hamano
parent
commit
7a2bff4593
  1. 11
      transport.c

11
transport.c

@ -474,13 +474,11 @@ struct ref *transport_get_remote_refs(struct transport *transport)
return transport->remote_refs; return transport->remote_refs;
} }


#define PACK_HEADS_CHUNK_COUNT 256

int transport_fetch_refs(struct transport *transport, struct ref *refs) int transport_fetch_refs(struct transport *transport, struct ref *refs)
{ {
int i; int i;
int nr_heads = 0; int nr_heads = 0, nr_alloc = 0;
char **heads = xmalloc(PACK_HEADS_CHUNK_COUNT * sizeof(char *)); char **heads = NULL;
struct ref *rm; struct ref *rm;
int use_objs = !transport->ops->fetch_refs; int use_objs = !transport->ops->fetch_refs;


@ -488,15 +486,12 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
if (rm->peer_ref && if (rm->peer_ref &&
!hashcmp(rm->peer_ref->old_sha1, rm->old_sha1)) !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1))
continue; continue;
ALLOC_GROW(heads, nr_heads + 1, nr_alloc);
if (use_objs) { if (use_objs) {
heads[nr_heads++] = xstrdup(sha1_to_hex(rm->old_sha1)); heads[nr_heads++] = xstrdup(sha1_to_hex(rm->old_sha1));
} else { } else {
heads[nr_heads++] = xstrdup(rm->name); heads[nr_heads++] = xstrdup(rm->name);
} }
if (nr_heads % PACK_HEADS_CHUNK_COUNT == 0)
heads = xrealloc(heads,
(nr_heads + PACK_HEADS_CHUNK_COUNT) *
sizeof(char *));
} }


if (use_objs) { if (use_objs) {

Loading…
Cancel
Save