From 25fd2f7a310df17dca298a3acf2aba716ceb8ce3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 16 Jun 2007 18:43:40 -0400 Subject: [PATCH 1/1] Fix ALLOC_GROW calls with obsolete semantics ALLOC_GROW now expects the 'nr' argument to be "how much you want" and not "how much you have". This fixes all cases where we weren't previously adding anything to the 'nr'. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index 98e24adcd7..8d8faf5d78 100644 --- a/dir.c +++ b/dir.c @@ -286,7 +286,7 @@ struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int if (cache_name_pos(pathname, len) >= 0) return NULL; - ALLOC_GROW(dir->entries, dir->nr, dir->alloc); + ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); return dir->entries[dir->nr++] = dir_entry_new(pathname, len); } @@ -295,7 +295,7 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, if (cache_name_pos(pathname, len) >= 0) return NULL; - ALLOC_GROW(dir->ignored, dir->ignored_nr, dir->ignored_alloc); + ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc); return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len); } -- 2.47.1