Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> --- builtin-add.c | 3 +-- builtin-rm.c | 3 +-- combine-diff.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
Show changes to 3 files +3 −6
builtin-add.c, builtin-rm.c, combine-diff.c
diff --git a/builtin-add.c b/builtin-add.c index 2d25698..3a73a17 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -21,8 +21,7 @@ static void prune_directory(struct dir_s for (specs = 0; pathspec[specs]; specs++) /* nothing */; - seen = xmalloc(specs); - memset(seen, 0, specs); + seen = xcalloc(specs, 1); src = dst = dir->entries; i = dir->nr; diff --git a/builtin-rm.c b/builtin-rm.c index 5deb811..bb810ba 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -90,8 +90,7 @@ int cmd_rm(int argc, const char **argv, seen = NULL; for (i = 0; pathspec[i] ; i++) /* nothing */; - seen = xmalloc(i); - memset(seen, 0, i); + seen = xcalloc(i, 1); for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; diff --git a/combine-diff.c b/combine-diff.c index 1bc1484..919112b 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -639,8 +639,7 @@ static int show_patch_diff(struct combin /* deleted file */ result_size = 0; elem->mode = 0; - result = xmalloc(1); - result[0] = 0; + result = xcalloc(1, 1); } if (0 <= fd) close(fd);
-- 1.4.2.rc1.ge7a0