From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 14 Sep 2007 07:31:18 +0000 (-0400)
Subject: Replace custom memory growth allocator with ALLOC_GROW
X-Git-Tag: v1.5.4-rc0~292^2~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a2bff45937a60d846abf3ccb42015539aedcb40;p=git.git

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>
---

diff --git a/transport.c b/transport.c
index e0111dcf0..2258492ae 100644
--- a/transport.c
+++ b/transport.c
@@ -474,13 +474,11 @@ struct ref *transport_get_remote_refs(struct transport *transport)
 	return transport->remote_refs;
 }
 
-#define PACK_HEADS_CHUNK_COUNT 256
-
 int transport_fetch_refs(struct transport *transport, struct ref *refs)
 {
 	int i;
-	int nr_heads = 0;
-	char **heads = xmalloc(PACK_HEADS_CHUNK_COUNT * sizeof(char *));
+	int nr_heads = 0, nr_alloc = 0;
+	char **heads = NULL;
 	struct ref *rm;
 	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 &&
 		    !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1))
 			continue;
+		ALLOC_GROW(heads, nr_heads + 1, nr_alloc);
 		if (use_objs) {
 			heads[nr_heads++] = xstrdup(sha1_to_hex(rm->old_sha1));
 		} else {
 			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) {