mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reftable/block: rename block_reader_start()

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2024-04-08 14:16:26 +02:00
committed by Junio C Hamano
parent 8f7582d995
commit 3122d44025
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reftable/block.c
View File

@ -266,7 +266,7 @@ static uint32_t block_reader_restart_offset(struct block_reader *br, int i)
return get_be24(br->restart_bytes + 3 * i); return get_be24(br->restart_bytes + 3 * i);
} }
void block_reader_start(struct block_reader *br, struct block_iter *it) void block_iter_seek_start(struct block_iter *it, struct block_reader *br)
{ {
it->br = br; it->br = br;
strbuf_reset(&it->last_key); strbuf_reset(&it->last_key);

2
reftable/block.h
View File

@ -98,7 +98,7 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
int hash_size); int hash_size);
/* Position `it` at start of the block */ /* Position `it` at start of the block */
void block_reader_start(struct block_reader *br, struct block_iter *it); void block_iter_seek_start(struct block_iter *it, struct block_reader *br);
/* Position `it` to the `want` key in the block */ /* Position `it` to the `want` key in the block */
int block_reader_seek(struct block_reader *br, struct block_iter *it, int block_reader_seek(struct block_reader *br, struct block_iter *it,

2
reftable/block_test.c
View File

@ -69,7 +69,7 @@ static void test_block_read_write(void)
block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ); block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
block_reader_start(&br, &it); block_iter_seek_start(&it, &br);
while (1) { while (1) {
int r = block_iter_next(&it, &rec); int r = block_iter_next(&it, &rec);

2
reftable/iter.c
View File

@ -115,7 +115,7 @@ static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
/* indexed block does not exist. */ /* indexed block does not exist. */
return REFTABLE_FORMAT_ERROR; return REFTABLE_FORMAT_ERROR;
} }
block_reader_start(&it->block_reader, &it->cur); block_iter_seek_start(&it->cur, &it->block_reader);
return 0; return 0;
} }

4
reftable/reader.c
View File

@ -345,7 +345,7 @@ static int table_iter_next_block(struct table_iter *dest,
*brp = br; *brp = br;
dest->is_finished = 0; dest->is_finished = 0;
block_reader_start(brp, &dest->bi); block_iter_seek_start(&dest->bi, brp);
} }
return 0; return 0;
} }
@ -429,7 +429,7 @@ static int reader_table_iter_at(struct reftable_reader *r,
ti->r = r; ti->r = r;
ti->typ = block_reader_type(brp); ti->typ = block_reader_type(brp);
ti->block_off = off; ti->block_off = off;
block_reader_start(brp, &ti->bi); block_iter_seek_start(&ti->bi, brp);
return 0; return 0;
} }