From 42c7bdc36d0aacfb7c0910126257a2009de0b1ca Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 8 Apr 2024 14:16:31 +0200 Subject: reftable/block: merge `block_iter_seek()` and `block_reader_seek()` 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 Signed-off-by: Junio C Hamano --- reftable/block.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'reftable/block.c') diff --git a/reftable/block.c b/reftable/block.c index 53ea92d04e..1015f9c04c 100644 --- a/reftable/block.c +++ b/reftable/block.c @@ -373,19 +373,14 @@ int block_reader_first_key(struct block_reader *br, struct strbuf *key) return 0; } -int block_iter_seek(struct block_iter *it, struct strbuf *want) -{ - return block_reader_seek(it->br, it, want); -} - void block_iter_close(struct block_iter *it) { strbuf_release(&it->last_key); strbuf_release(&it->scratch); } -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) { struct restart_needle_less_args args = { .needle = *want, -- cgit v1.3-5-g45d5