aboutsummaryrefslogtreecommitdiffstats
path: root/add-interactive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-19 15:25:38 -0700
committerJunio C Hamano <gitster@pobox.com>2021-03-19 15:25:38 -0700
commit92ccd7b7529a852583c5033ba28b4414cd2f7654 (patch)
treebce1548bcd2cd806a4524b812fb56f19b397b7d2 /add-interactive.c
parentMerge branch 'rs/avoid-null-statement-after-macro-call' (diff)
parentcocci: allow xcalloc(1, size) (diff)
downloadgit-92ccd7b7529a852583c5033ba28b4414cd2f7654.tar.gz
git-92ccd7b7529a852583c5033ba28b4414cd2f7654.zip
Merge branch 'rs/calloc-array'
CALLOC_ARRAY() macro replaces many uses of xcalloc(). * rs/calloc-array: cocci: allow xcalloc(1, size) use CALLOC_ARRAY git-compat-util.h: drop trailing semicolon from macro definition
Diffstat (limited to 'add-interactive.c')
-rw-r--r--add-interactive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/add-interactive.c b/add-interactive.c
index 9b8cdb4a31..1f3f8f72f8 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -476,7 +476,7 @@ static void collect_changes_cb(struct diff_queue_struct *q,
add_file_item(s->files, name);
- entry = xcalloc(sizeof(*entry), 1);
+ CALLOC_ARRAY(entry, 1);
hashmap_entry_init(&entry->ent, hash);
entry->name = s->files->items[s->files->nr - 1].string;
entry->item = s->files->items[s->files->nr - 1].util;