threads / patch / 26118

patchattr.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Subject: [PATCH] attr.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

## tl;dr

3 messages between Dec 22, 2010 and Dec 22, 2010. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Thiago Farina· Dec 22, 2010, 00:35 UTC · lore

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
---
 attr.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Show changes to attr.c +2 −6

diff --git a/attr.c b/attr.c
index 6aff695..fdc0515 100644
--- a/attr.c
+++ b/attr.c
@@ -305,12 +305,8 @@ static void handle_attr_line(struct attr_stack *res,
 	a = parse_attr_line(line, src, lineno, macro_ok);
 	if (!a)
 		return;
-	if (res->alloc <= res->num_matches) {
-		res->alloc = alloc_nr(res->num_matches);
-		res->attrs = xrealloc(res->attrs,
-				      sizeof(struct match_attr *) *
-				      res->alloc);
-	}
+
+	ALLOC_GROW(res->attrs, res->num_matches + 1, res->alloc);
 	res->attrs[res->num_matches++] = a;
 }

-- 
1.7.3.2.343.g7d43d

Junio C Hamano· Dec 22, 2010, 00:59 UTC · re: Thiago Farina · lore

Re: [PATCH] attr.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

Instead of trickling these down, can you give a single patch to convert the remaining ones you have been finding with "git grep -e alloc_nr"?

Thiago Farina· Dec 22, 2010, 01:04 UTC · re: Junio C Hamano · lore

Re: [PATCH] attr.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

On Tue, Dec 21, 2010 at 10:59 PM, Junio C Hamano <gitster@pobox.com> wrote:

> Instead of trickling these down, can you give a single patch to convert
> the remaining ones you have been finding with "git grep -e alloc_nr"?
>

$ git grep -w alloc_nr | grep -v cache.h | wc -l

Sorry, but I wouldn't feel comfortable fixing 19 files now. At least not exactly now. Perhaps on the weekend.