summaryrefslogtreecommitdiff
path: root/diffcore-rename.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 /diffcore-rename.c
parenta8a0ac3234317e47b2510f054a3a5b3d02564c98 (diff)
parent1c57cc70ec26529a26392539fc888486bb89b7fd (diff)
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 'diffcore-rename.c')
-rw-r--r--diffcore-rename.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 41558185ae..9c1478c078 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -787,8 +787,7 @@ void diffcore_rename(struct diff_options *options)
(uint64_t)num_destinations * (uint64_t)num_sources);
}
- mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_destinations),
- sizeof(*mx));
+ CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
struct diff_filespec *two = rename_dst[i].p->two;
struct diff_score *m;