Skip to content

Commit 47616c4

Browse files
pks-tgitster
authored andcommitted
reftable/stack: use size_t to track stack slices during compaction
We use `int`s to track reftable slices when compacting the reftable stack, which is considered to be a code smell in the Git project. Convert the code to use `size_t` instead. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6d5e80f commit 47616c4

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

reftable/stack.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ static int stack_try_add(struct reftable_stack *st,
2424
void *arg),
2525
void *arg);
2626
static int stack_write_compact(struct reftable_stack *st,
27-
struct reftable_writer *wr, int first, int last,
27+
struct reftable_writer *wr,
28+
size_t first, size_t last,
2829
struct reftable_log_expiry_config *config);
2930
static int stack_check_addition(struct reftable_stack *st,
3031
const char *new_tab_name);
@@ -820,7 +821,8 @@ uint64_t reftable_stack_next_update_index(struct reftable_stack *st)
820821
return 1;
821822
}
822823

823-
static int stack_compact_locked(struct reftable_stack *st, int first, int last,
824+
static int stack_compact_locked(struct reftable_stack *st,
825+
size_t first, size_t last,
824826
struct strbuf *temp_tab,
825827
struct reftable_log_expiry_config *config)
826828
{
@@ -864,22 +866,21 @@ static int stack_compact_locked(struct reftable_stack *st, int first, int last,
864866
}
865867

866868
static int stack_write_compact(struct reftable_stack *st,
867-
struct reftable_writer *wr, int first, int last,
869+
struct reftable_writer *wr,
870+
size_t first, size_t last,
868871
struct reftable_log_expiry_config *config)
869872
{
870873
int subtabs_len = last - first + 1;
871874
struct reftable_table *subtabs = reftable_calloc(
872875
last - first + 1, sizeof(*subtabs));
873876
struct reftable_merged_table *mt = NULL;
874-
int err = 0;
875877
struct reftable_iterator it = { NULL };
876878
struct reftable_ref_record ref = { NULL };
877879
struct reftable_log_record log = { NULL };
878-
879880
uint64_t entries = 0;
881+
int err = 0;
880882

881-
int i = 0, j = 0;
882-
for (i = first, j = 0; i <= last; i++) {
883+
for (size_t i = first, j = 0; i <= last; i++) {
883884
struct reftable_reader *t = st->readers[i];
884885
reftable_table_from_reader(&subtabs[j++], t);
885886
st->stats.bytes += t->size;
@@ -963,7 +964,8 @@ static int stack_write_compact(struct reftable_stack *st,
963964
}
964965

965966
/* < 0: error. 0 == OK, > 0 attempt failed; could retry. */
966-
static int stack_compact_range(struct reftable_stack *st, int first, int last,
967+
static int stack_compact_range(struct reftable_stack *st,
968+
size_t first, size_t last,
967969
struct reftable_log_expiry_config *expiry)
968970
{
969971
char **delete_on_success = NULL, **subtable_locks = NULL, **listp = NULL;
@@ -972,12 +974,10 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
972974
struct strbuf lock_file_name = STRBUF_INIT;
973975
struct strbuf ref_list_contents = STRBUF_INIT;
974976
struct strbuf new_table_path = STRBUF_INIT;
977+
size_t i, j, compact_count;
975978
int err = 0;
976979
int have_lock = 0;
977980
int lock_file_fd = -1;
978-
int compact_count;
979-
int i = 0;
980-
int j = 0;
981981
int is_empty_table = 0;
982982

983983
if (first > last || (!expiry && first == last)) {
@@ -1172,17 +1172,17 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
11721172
int reftable_stack_compact_all(struct reftable_stack *st,
11731173
struct reftable_log_expiry_config *config)
11741174
{
1175-
return stack_compact_range(st, 0, st->merged->stack_len - 1, config);
1175+
return stack_compact_range(st, 0, st->merged->stack_len ?
1176+
st->merged->stack_len - 1 : 0, config);
11761177
}
11771178

1178-
static int stack_compact_range_stats(struct reftable_stack *st, int first,
1179-
int last,
1179+
static int stack_compact_range_stats(struct reftable_stack *st,
1180+
size_t first, size_t last,
11801181
struct reftable_log_expiry_config *config)
11811182
{
11821183
int err = stack_compact_range(st, first, last, config);
1183-
if (err > 0) {
1184+
if (err > 0)
11841185
st->stats.failures++;
1185-
}
11861186
return err;
11871187
}
11881188

0 commit comments

Comments
 (0)