reftable/block: better grouping of functions

Function definitions and declaration of `struct block_reader` and
`struct block_iter` are somewhat mixed up, making it hard to see which
functions belong together. Rearrange them.

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 1015f9c04c4a5651dc8bb407a856549d5738f17d..e65453e11b2a14faeb19ca80b2f5374583e091da 100644 (file)
--- a/reftable/block.c
+++ b/reftable/block.c
@@ -175,11 +175,6 @@ int block_writer_finish(struct block_writer *w)
        return w->next;
 }
 
-uint8_t block_reader_type(struct block_reader *r)
-{
-       return r->block.data[r->header_off];
-}
-
 int block_reader_init(struct block_reader *br, struct reftable_block *block,
                      uint32_t header_off, uint32_t table_block_size,
                      int hash_size)
@@ -261,6 +256,31 @@ done:
        return err;
 }
 
+uint8_t block_reader_type(struct block_reader *r)
+{
+       return r->block.data[r->header_off];
+}
+
+int block_reader_first_key(struct block_reader *br, struct strbuf *key)
+{
+       int off = br->header_off + 4, n;
+       struct string_view in = {
+               .buf = br->block.data + off,
+               .len = br->block_len - off,
+       };
+       uint8_t extra = 0;
+
+       strbuf_reset(key);
+
+       n = reftable_decode_key(key, &extra, in);
+       if (n < 0)
+               return n;
+       if (!key->len)
+               return REFTABLE_FORMAT_ERROR;
+
+       return 0;
+}
+
 static uint32_t block_reader_restart_offset(struct block_reader *br, int i)
 {
        return get_be24(br->restart_bytes + 3 * i);
@@ -353,26 +373,6 @@ int block_iter_next(struct block_iter *it, struct reftable_record *rec)
        return 0;
 }
 
-int block_reader_first_key(struct block_reader *br, struct strbuf *key)
-{
-       int off = br->header_off + 4, n;
-       struct string_view in = {
-               .buf = br->block.data + off,
-               .len = br->block_len - off,
-       };
-       uint8_t extra = 0;
-
-       strbuf_reset(key);
-
-       n = reftable_decode_key(key, &extra, in);
-       if (n < 0)
-               return n;
-       if (!key->len)
-               return REFTABLE_FORMAT_ERROR;
-
-       return 0;
-}
-
 void block_iter_close(struct block_iter *it)
 {
        strbuf_release(&it->last_key);

diff --git a/reftable/block.h b/reftable/block.h
index 1734bee917d5f1b7879db7cacfa7318a74796d4a..d73ed735496f5e768b5e1fbbd2e3b9c52c47188f 100644 (file)
--- a/reftable/block.h
+++ b/reftable/block.h
@@ -76,6 +76,17 @@ struct block_reader {
        uint32_t full_block_size;
 };
 
+/* initializes a block reader. */
+int block_reader_init(struct block_reader *br, struct reftable_block *bl,
+                     uint32_t header_off, uint32_t table_block_size,
+                     int hash_size);
+
+/* Returns the block type (eg. 'r' for refs) */
+uint8_t block_reader_type(struct block_reader *r);
+
+/* Decodes the first key in the block */
+int block_reader_first_key(struct block_reader *br, struct strbuf *key);
+
 /* Iterate over entries in a block */
 struct block_iter {
        /* offset within the block of the next entry to read. */
@@ -92,11 +103,6 @@ struct block_iter {
        .scratch = STRBUF_INIT, \
 }
 
-/* initializes a block reader. */
-int block_reader_init(struct block_reader *br, struct reftable_block *bl,
-                     uint32_t header_off, uint32_t table_block_size,
-                     int hash_size);
-
 /* Position `it` at start of the block */
 void block_iter_seek_start(struct block_iter *it, struct block_reader *br);
 
@@ -104,12 +110,6 @@ void block_iter_seek_start(struct block_iter *it, struct block_reader *br);
 int block_iter_seek_key(struct block_iter *it, struct block_reader *br,
                        struct strbuf *want);
 
-/* Returns the block type (eg. 'r' for refs) */
-uint8_t block_reader_type(struct block_reader *r);
-
-/* Decodes the first key in the block */
-int block_reader_first_key(struct block_reader *br, struct strbuf *key);
-
 void block_iter_copy_from(struct block_iter *dest, struct block_iter *src);
 
 /* return < 0 for error, 0 for OK, > 0 for EOF. */