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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index 98e24adcd7210ad0ffa9062ae45f53a6f1b7b9b2..8d8faf5d788b402d5fd4f5d724954fd2ee178fdb 100644 (file)
--- 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;
 
        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);
 }
 
        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;
 
        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);
 }
 
        return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
 }