reftable/block: rename `block_reader_start()`
The function `block_reader_start()` does not really apply to the block reader, but to the block iterator. It's name is thus somewhat confusing. Rename it to `block_iter_seek_start()` to clarify. We will rename `block_reader_seek()` in similar spirit in the next commit. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Apr 8, 2024 at 14:16 UTC
3122d44025e29571aecda02fe3699f240246f3b2
5 files changed
+6
-6
reftable/block.c
+1
-1
@@ -266,7 +266,7 @@ static uint32_t block_reader_restart_offset(struct block_reader *br, int i)
266
return get_be24(br->restart_bytes + 3 * i);
267
}
268
269
-void block_reader_start(struct block_reader *br, struct block_iter *it)
269
+void block_iter_seek_start(struct block_iter *it, struct block_reader *br)
270
{
271
it->br = br;
272
strbuf_reset(&it->last_key);
reftable/block.h
+1
-1
@@ -98,7 +98,7 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
98
int hash_size);
99
100
/* Position `it` at start of the block */
101
-void block_reader_start(struct block_reader *br, struct block_iter *it);
101
+void block_iter_seek_start(struct block_iter *it, struct block_reader *br);
102
103
/* Position `it` to the `want` key in the block */
104
int block_reader_seek(struct block_reader *br, struct block_iter *it,
reftable/block_test.c
+1
-1
@@ -69,7 +69,7 @@ static void test_block_read_write(void)
69
70
block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
71
72
- block_reader_start(&br, &it);
72
+ block_iter_seek_start(&it, &br);
73
74
while (1) {
75
int r = block_iter_next(&it, &rec);
reftable/iter.c
+1
-1
@@ -115,7 +115,7 @@ static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
115
/* indexed block does not exist. */
116
return REFTABLE_FORMAT_ERROR;
117
}
118
- block_reader_start(&it->block_reader, &it->cur);
118
+ block_iter_seek_start(&it->cur, &it->block_reader);
119
return 0;
120
}
121
reftable/reader.c
+2
-2
@@ -345,7 +345,7 @@ static int table_iter_next_block(struct table_iter *dest,
345
*brp = br;
346
347
dest->is_finished = 0;
348
- block_reader_start(brp, &dest->bi);
348
+ block_iter_seek_start(&dest->bi, brp);
349
}
350
return 0;
351
}
@@ -429,7 +429,7 @@ static int reader_table_iter_at(struct reftable_reader *r,
429
ti->r = r;
430
ti->typ = block_reader_type(brp);
431
ti->block_off = off;
432
- block_reader_start(brp, &ti->bi);
432
+ block_iter_seek_start(&ti->bi, brp);
433
return 0;
434
}
435