]> git.ipfire.org Git - thirdparty/git.git/commitdiff
reftable/stack: refactor function to gather table sizes
authorPatrick Steinhardt <ps@pks.im>
Thu, 8 Aug 2024 14:06:19 +0000 (16:06 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Aug 2024 17:14:41 +0000 (10:14 -0700)
Refactor the function that gathers table sizes to be more idiomatic. For
one, use `REFTABLE_CALLOC_ARRAY()` instead of `reftable_calloc()`.
Second, avoid using an integer to iterate through the tables in the
reftable stack given that `stack_len` itself is using a `size_t`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
reftable/stack.c

index 737591125e74965c3cbfb60884b1b5efd4359b13..ba8234b4865b714f3daebc0d0333b18244de6ae1 100644 (file)
@@ -1305,14 +1305,15 @@ struct segment suggest_compaction_segment(uint64_t *sizes, size_t n,
 
 static uint64_t *stack_table_sizes_for_compaction(struct reftable_stack *st)
 {
-       uint64_t *sizes =
-               reftable_calloc(st->merged->stack_len, sizeof(*sizes));
        int version = (st->opts.hash_id == GIT_SHA1_FORMAT_ID) ? 1 : 2;
        int overhead = header_size(version) - 1;
-       int i = 0;
-       for (i = 0; i < st->merged->stack_len; i++) {
+       uint64_t *sizes;
+
+       REFTABLE_CALLOC_ARRAY(sizes, st->merged->stack_len);
+
+       for (size_t i = 0; i < st->merged->stack_len; i++)
                sizes[i] = st->readers[i]->size - overhead;
-       }
+
        return sizes;
 }