reftable/block: rename `block_reader_start()`

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>

diff --git a/reftable/block.c b/reftable/block.c
index 298e8c56b9e2085b798f50a05c136ad67c5cdbfe..53ea92d04eeae9f152513f5a96f812e0d1ab5031 100644 (file)
--- a/reftable/block.c
+++ b/reftable/block.c
@@ -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);
 }
 
-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;
        strbuf_reset(&it->last_key);

diff --git a/reftable/block.h b/reftable/block.h
index 47acc62c0ab8cdd6816d49152312b1e61dfe3d6d..44a9a8de7da72b1c3d8b99335cc39e81cae0e0ab 100644 (file)
--- a/reftable/block.h
+++ b/reftable/block.h
@@ -98,7 +98,7 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
                      int hash_size);
 
 /* 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 */
 int block_reader_seek(struct block_reader *br, struct block_iter *it,

diff --git a/reftable/block_test.c b/reftable/block_test.c
index e162c6e33fa00af4e2b3b653c0d6210aea57c803..a719be7c50f350ca0c8001324110801c6fdf2cb3 100644 (file)
--- a/reftable/block_test.c
+++ b/reftable/block_test.c
@@ -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_start(&br, &it);
+       block_iter_seek_start(&it, &br);
 
        while (1) {
                int r = block_iter_next(&it, &rec);

diff --git a/reftable/iter.c b/reftable/iter.c
index 7aa30c4a51e54ec5442b9d8a3bf90b8119c5a4f0..aa9ac199b1e93bc87b41e0717c6795676deef4b5 100644 (file)
--- a/reftable/iter.c
+++ b/reftable/iter.c
@@ -115,7 +115,7 @@ static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
                /* indexed block does not exist. */
                return REFTABLE_FORMAT_ERROR;
        }
-       block_reader_start(&it->block_reader, &it->cur);
+       block_iter_seek_start(&it->cur, &it->block_reader);
        return 0;
 }
 

diff --git a/reftable/reader.c b/reftable/reader.c
index b113daab77336c240d10f64ce9890ff04f5f366a..d7d47e86405e864d3b41448537fbb29106a297ae 100644 (file)
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -345,7 +345,7 @@ static int table_iter_next_block(struct table_iter *dest,
                *brp = br;
 
                dest->is_finished = 0;
-               block_reader_start(brp, &dest->bi);
+               block_iter_seek_start(&dest->bi, brp);
        }
        return 0;
 }
@@ -429,7 +429,7 @@ static int reader_table_iter_at(struct reftable_reader *r,
        ti->r = r;
        ti->typ = block_reader_type(brp);
        ti->block_off = off;
-       block_reader_start(brp, &ti->bi);
+       block_iter_seek_start(&ti->bi, brp);
        return 0;
 }