From: Taylor Blau <me@ttaylorr.com>
Date: Tue, 20 Sep 2022 01:55:50 +0000 (-0400)
Subject: midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
X-Git-Tag: v2.39.0-rc0~123^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb6c48cbbc7e196739b42c16c84fa320cc82b5c4;p=thirdparty%2Fgit.git

midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`

Replace a direct invocation of Git's `xcalloc()` wrapper with the
`CALLOC_ARRAY()` macro instead.

The latter is preferred since it is more conventional in Git's codebase,
but also because it automatically picks the correct value for the record
size.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/midx.c b/midx.c
index 05bcfc6f02..d703fc5a16 100644
--- a/midx.c
+++ b/midx.c
@@ -1912,9 +1912,11 @@ static int fill_included_packs_batch(struct repository *r,
 {
 	uint32_t i, packs_to_repack;
 	size_t total_size;
-	struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info));
+	struct repack_info *pack_info;
 	int pack_kept_objects = 0;
 
+	CALLOC_ARRAY(pack_info, m->num_packs);
+
 	repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects);
 
 	for (i = 0; i < m->num_packs; i++) {