reftable/block: introduce `block_reader_release()`

Introduce a new function `block_reader_release()` that releases
resources acquired by the block reader. This function will be extended
in a subsequent 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 e65453e11b2a14faeb19ca80b2f5374583e091da..fe836c21e5c2162fa444572733697ca4ae242bd7 100644 (file)
--- a/reftable/block.c
+++ b/reftable/block.c
@@ -256,6 +256,11 @@ done:
        return err;
 }
 
+void block_reader_release(struct block_reader *br)
+{
+       reftable_block_done(&br->block);
+}
+
 uint8_t block_reader_type(struct block_reader *r)
 {
        return r->block.data[r->header_off];

diff --git a/reftable/block.h b/reftable/block.h
index d73ed735496f5e768b5e1fbbd2e3b9c52c47188f..601a1e0e89a09da8f6734d3e95f79cc27bcc59c4 100644 (file)
--- a/reftable/block.h
+++ b/reftable/block.h
@@ -81,6 +81,8 @@ int block_reader_init(struct block_reader *br, struct reftable_block *bl,
                      uint32_t header_off, uint32_t table_block_size,
                      int hash_size);
 
+void block_reader_release(struct block_reader *br);
+
 /* Returns the block type (eg. 'r' for refs) */
 uint8_t block_reader_type(struct block_reader *r);
 

diff --git a/reftable/reader.c b/reftable/reader.c
index f70efa2b7c9acbd532d88996bfcd98703e0c53ed..f925570bf31a254b9657c525b05de911cae26cad 100644 (file)
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -253,7 +253,7 @@ static void table_iter_block_done(struct table_iter *ti)
        if (!ti->bi.br) {
                return;
        }
-       reftable_block_done(&ti->bi.br->block);
+       block_reader_release(ti->bi.br);
        FREE_AND_NULL(ti->bi.br);
 
        ti->bi.last_key.len = 0;