t/helper: inline `reftable_reader_print_file()`

Move `reftable_reader_print_file()` into the "dump-reftable" helper.
This follows the same reasoning as the preceding commit.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reftable/reader.c b/reftable/reader.c
index e3f58542297d1a1473c707f17f305c3b72dc7843..fbd93b88dff69e7bcc7edb4ccaadef193f5ec967 100644 (file)
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -798,27 +798,6 @@ void reftable_table_from_reader(struct reftable_table *tab,
        tab->table_arg = reader;
 }
 
-
-int reftable_reader_print_file(const char *tablename)
-{
-       struct reftable_block_source src = { NULL };
-       int err = reftable_block_source_from_file(&src, tablename);
-       struct reftable_reader *r = NULL;
-       struct reftable_table tab = { NULL };
-       if (err < 0)
-               goto done;
-
-       err = reftable_new_reader(&r, &src, tablename);
-       if (err < 0)
-               goto done;
-
-       reftable_table_from_reader(&tab, r);
-       err = reftable_table_print(&tab);
-done:
-       reftable_reader_free(r);
-       return err;
-}
-
 int reftable_reader_print_blocks(const char *tablename)
 {
        struct {

diff --git a/reftable/reftable-reader.h b/reftable/reftable-reader.h
index a32f31d6486ff5dcdaa4a8fc6de45c33236d58a7..7c7d17165168a6451ae0f7f044885dbb323cf5ba 100644 (file)
--- a/reftable/reftable-reader.h
+++ b/reftable/reftable-reader.h
@@ -64,8 +64,6 @@ uint64_t reftable_reader_min_update_index(struct reftable_reader *r);
 void reftable_table_from_reader(struct reftable_table *tab,
                                struct reftable_reader *reader);
 
-/* print table onto stdout for debugging. */
-int reftable_reader_print_file(const char *tablename);
 /* print blocks onto stdout for debugging. */
 int reftable_reader_print_blocks(const char *tablename);
 

diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
index 7f37d0cd34b8f5a0cc9aeab4f47f1a02bcf7c709..19367c25f9a1f76f23508ec7fcd5426fcab11244 100644 (file)
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@ -1,5 +1,6 @@
 #include "reftable/system.h"
 #include "reftable/reftable-error.h"
+#include "reftable/reftable-generic.h"
 #include "reftable/reftable-reader.h"
 #include "reftable/reftable-stack.h"
 #include "reftable/reftable-tests.h"
@@ -28,6 +29,26 @@ static void print_help(void)
               "\n");
 }
 
+static int dump_reftable(const char *tablename)
+{
+       struct reftable_block_source src = { NULL };
+       int err = reftable_block_source_from_file(&src, tablename);
+       struct reftable_reader *r = NULL;
+       struct reftable_table tab = { NULL };
+       if (err < 0)
+               goto done;
+
+       err = reftable_new_reader(&r, &src, tablename);
+       if (err < 0)
+               goto done;
+
+       reftable_table_from_reader(&tab, r);
+       err = reftable_table_print(&tab);
+done:
+       reftable_reader_free(r);
+       return err;
+}
+
 int cmd__dump_reftable(int argc, const char **argv)
 {
        int err = 0;
@@ -64,7 +85,7 @@ int cmd__dump_reftable(int argc, const char **argv)
        if (opt_dump_blocks) {
                err = reftable_reader_print_blocks(arg);
        } else if (opt_dump_table) {
-               err = reftable_reader_print_file(arg);
+               err = dump_reftable(arg);
        } else if (opt_dump_stack) {
                err = reftable_stack_print_directory(arg, opt_hash_id);
        }