Browse Source

xcalloc: use CALLOC_ARRAY() when applicable

These are for codebase before Git 2.31

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 4 years ago
parent
commit
486f4bd183
  1. 8
      builtin/receive-pack.c
  2. 2
      t/helper/test-bloom.c

8
builtin/receive-pack.c

@ -1837,11 +1837,9 @@ static void prepare_shallow_update(struct shallow_info *si) @@ -1837,11 +1837,9 @@ static void prepare_shallow_update(struct shallow_info *si)
ALLOC_ARRAY(si->used_shallow, si->shallow->nr);
assign_shallow_commits_to_refs(si, si->used_shallow, NULL);

si->need_reachability_test =
xcalloc(si->shallow->nr, sizeof(*si->need_reachability_test));
si->reachable =
xcalloc(si->shallow->nr, sizeof(*si->reachable));
si->shallow_ref = xcalloc(si->ref->nr, sizeof(*si->shallow_ref));
CALLOC_ARRAY(si->need_reachability_test, si->shallow->nr);
CALLOC_ARRAY(si->reachable, si->shallow->nr);
CALLOC_ARRAY(si->shallow_ref, si->ref->nr);

for (i = 0; i < si->nr_ours; i++)
si->need_reachability_test[si->ours[i]] = 1;

2
t/helper/test-bloom.c

@ -65,7 +65,7 @@ int cmd__bloom(int argc, const char **argv) @@ -65,7 +65,7 @@ int cmd__bloom(int argc, const char **argv)
struct bloom_filter filter;
int i = 2;
filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
filter.data = xcalloc(filter.len, sizeof(unsigned char));
CALLOC_ARRAY(filter.data, filter.len);

if (argc - 1 < i)
usage(bloom_usage);

Loading…
Cancel
Save