From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 1 Aug 2007 04:32:36 +0000 (-0400)
Subject: Use handy ALLOC_GROW macro in fast-import when possible
X-Git-Tag: v1.5.3-rc6~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3149007475f8c38ee66b448af9c55fc102534c46;p=git.git

Use handy ALLOC_GROW macro in fast-import when possible

Instead of growing our buffer by hand during the inline variant of
cmd_data() we can save a few lines of code and just use the nifty
new ALLOC_GROW macro already available to us.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/fast-import.c b/fast-import.c
index 7e136a616..d7fa2b7ba 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1487,12 +1487,7 @@ static void *cmd_data (size_t *size)
 			if (term_len == command_buf.len
 				&& !strcmp(term, command_buf.buf))
 				break;
-			if (sz < (length + command_buf.len)) {
-				sz = sz * 3 / 2 + 16;
-				if (sz < (length + command_buf.len))
-					sz = length + command_buf.len;
-				buffer = xrealloc(buffer, sz);
-			}
+			ALLOC_GROW(buffer, length + command_buf.len, sz);
 			memcpy(buffer + length,
 				command_buf.buf,
 				command_buf.len - 1);