From: Thiago Farina <tfransosi@gmail.com>
Date: Sun, 19 Dec 2010 11:56:25 +0000 (-0200)
Subject: builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
X-Git-Tag: v1.7.4-rc0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=834d9eb6b70a3447c2ad514f9c0e052bc43e8c8a;p=git.git

builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rm.c b/builtin/rm.c
index c7b7bb37a..ff491d776 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -20,15 +20,6 @@ static struct {
 	const char **name;
 } list;
 
-static void add_list(const char *name)
-{
-	if (list.nr >= list.alloc) {
-		list.alloc = alloc_nr(list.alloc);
-		list.name = xrealloc(list.name, list.alloc * sizeof(const char *));
-	}
-	list.name[list.nr++] = name;
-}
-
 static int check_local_mod(unsigned char *head, int index_only)
 {
 	/*
@@ -182,7 +173,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 		struct cache_entry *ce = active_cache[i];
 		if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen))
 			continue;
-		add_list(ce->name);
+		ALLOC_GROW(list.name, list.nr + 1, list.alloc);
+		list.name[list.nr++] = ce->name;
 	}
 
 	if (pathspec) {