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/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'reftable/reader.c') diff --git a/reftable/reader.c b/reftable/reader.c index d7d47e8640..f70efa2b7c 100644 --- a/reftable/reader.c +++ b/reftable/reader.c @@ -483,7 +483,7 @@ static int reader_seek_linear(struct table_iter *ti, table_iter_copy_from(ti, &next); } - err = block_iter_seek(&ti->bi, &want_key); + err = block_iter_seek_key(&ti->bi, ti->bi.br, &want_key); if (err < 0) goto done; err = 0; @@ -558,7 +558,7 @@ static int reader_seek_indexed(struct reftable_reader *r, if (err != 0) goto done; - err = block_iter_seek(&next.bi, &want_index.u.idx.last_key); + err = block_iter_seek_key(&next.bi, next.bi.br, &want_index.u.idx.last_key); if (err < 0) goto done; -- cgit v1.3