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 <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Apr 8, 2024 at 14:16 UTC
42c7bdc36d0aacfb7c0910126257a2009de0b1ca
4 files changed
+8
-16
reftable/block.c
+2
-7
@@ -373,19 +373,14 @@ int block_reader_first_key(struct block_reader *br, struct strbuf *key)
373
return 0;
374
}
375
376
-int block_iter_seek(struct block_iter *it, struct strbuf *want)
377
-{
378
- return block_reader_seek(it->br, it, want);
379
-}
380
-
376
void block_iter_close(struct block_iter *it)
377
{
378
strbuf_release(&it->last_key);
379
strbuf_release(&it->scratch);
380
}
381
387
-int block_reader_seek(struct block_reader *br, struct block_iter *it,
388
- struct strbuf *want)
382
+int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
383
+ struct strbuf *want)
384
{
385
struct restart_needle_less_args args = {
386
.needle = *want,
reftable/block.h
+2
-5
@@ -101,8 +101,8 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
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,
105
- struct strbuf *want);
104
+int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
105
+ struct strbuf *want);
106
107
/* Returns the block type (eg. 'r' for refs) */
108
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);
115
/* return < 0 for error, 0 for OK, > 0 for EOF. */
116
int block_iter_next(struct block_iter *it, struct reftable_record *rec);
117
118
-/* Seek to `want` with in the block pointed to by `it` */
119
-int block_iter_seek(struct block_iter *it, struct strbuf *want);
120
-
118
/* deallocate memory for `it`. The block reader and its block is left intact. */
119
void block_iter_close(struct block_iter *it);
120
reftable/block_test.c
+2
-2
@@ -89,7 +89,7 @@ static void test_block_read_write(void)
89
strbuf_reset(&want);
90
strbuf_addstr(&want, names[i]);
91
92
- n = block_reader_seek(&br, &it, &want);
92
+ n = block_iter_seek_key(&it, &br, &want);
93
EXPECT(n == 0);
94
95
n = block_iter_next(&it, &rec);
@@ -98,7 +98,7 @@ static void test_block_read_write(void)
98
EXPECT_STREQ(names[i], rec.u.ref.refname);
99
100
want.len--;
101
- n = block_reader_seek(&br, &it, &want);
101
+ n = block_iter_seek_key(&it, &br, &want);
102
EXPECT(n == 0);
103
104
n = block_iter_next(&it, &rec);
reftable/reader.c
+2
-2
@@ -483,7 +483,7 @@ static int reader_seek_linear(struct table_iter *ti,
483
table_iter_copy_from(ti, &next);
484
}
485
486
- err = block_iter_seek(&ti->bi, &want_key);
486
+ err = block_iter_seek_key(&ti->bi, ti->bi.br, &want_key);
487
if (err < 0)
488
goto done;
489
err = 0;
@@ -558,7 +558,7 @@ static int reader_seek_indexed(struct reftable_reader *r,
558
if (err != 0)
559
goto done;
560
561
- err = block_iter_seek(&next.bi, &want_index.u.idx.last_key);
561
+ err = block_iter_seek_key(&next.bi, next.bi.br, &want_index.u.idx.last_key);
562
if (err < 0)
563
goto done;
564