[PATCH v4 00/14] Use ALLOC_GROW() instead of inline code · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 01/14] builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 02/14] bundle.c: use ALLOC_GROW() in add_to_ref_list() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 08/14] replace_object.c: use ALLOC_GROW() in register_replace_object() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 12/14] builtin/mktree.c: use ALLOC_GROW() in append_to_tree() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 14/14] sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 10/14] dir.c: use ALLOC_GROW() in create_simplify() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 11/14] attr.c: use ALLOC_GROW() in handle_attr_line() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 13/14] read-cache.c: use ALLOC_GROW() in add_index_entry() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 07/14] patch-ids.c: use ALLOC_GROW() in add_commit() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 03/14] cache-tree.c: use ALLOC_GROW() in find_subtree() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 09/14] reflog-walk.c: use ALLOC_GROW() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 05/14] diff.c: use ALLOC_GROW() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 06/14] diffcore-rename.c: use ALLOC_GROW() · Dmitry S. Dolzhenko <hidden> · 2016-06-15
[PATCH v4 04/14] commit.c: use ALLOC_GROW() in register_commit_graft() · Dmitry S. Dolzhenko <hidden> · 2016-06-15

DORMANTno replies

Revision v4 of 3 in this series.

Revisions (3)

2016-06-15 v2 [diff vs current]
2016-06-15 v3 [diff vs current]
2016-06-15 v4 current

[PATCH v4 10/14] dir.c: use ALLOC_GROW() in create_simplify()

From: Dmitry S. Dolzhenko <hidden>
Date: 2016-06-15 23:00:10
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Dmitry S. Dolzhenko <redacted>
---
 dir.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dir.c b/dir.c
index 98bb50f..4ae38e4 100644
--- a/dir.c
+++ b/dir.c

@@ -1341,10 +1341,7 @@ static struct path_simplify *create_simplify(const char **pathspec)
 
 	for (nr = 0 ; ; nr++) {
 		const char *match;
-		if (nr >= alloc) {
-			alloc = alloc_nr(alloc);
-			simplify = xrealloc(simplify, alloc * sizeof(*simplify));
-		}
+		ALLOC_GROW(simplify, nr + 1, alloc);
 		match = *pathspec++;
 		if (!match)
 			break;

-- 
1.8.3.2