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

reftable/block: merge block_iter_seek() and block_reader_seek()

Browse Source 
The function `block_iter_seek()` is merely a simple wrapper around
`block_reader_seek()`. Merge those two functions into a new function
`block_iter_seek_key()` that more clearly says what it is actually
doing.

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:31 +02:00
committed by Junio C Hamano
parent 3122d44025
commit 42c7bdc36d
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
reftable/block.h
View File

@ -101,8 +101,8 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
void block_iter_seek_start(struct block_iter *it, struct block_reader *br);
/* Position `it` to the `want` key in the block */
int block_reader_seek(struct block_reader *br, struct block_iter *it,
struct strbuf *want);
int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
struct strbuf *want);
/* Returns the block type (eg. 'r' for refs) */
uint8_t block_reader_type(struct block_reader *r);
@ -115,9 +115,6 @@ void block_iter_copy_from(struct block_iter *dest, struct block_iter *src);
/* return < 0 for error, 0 for OK, > 0 for EOF. */
int block_iter_next(struct block_iter *it, struct reftable_record *rec);
/* Seek to `want` with in the block pointed to by `it` */
int block_iter_seek(struct block_iter *it, struct strbuf *want);
/* deallocate memory for `it`. The block reader and its block is left intact. */
void block_iter_close(struct block_iter *it);