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>
Patrick Steinhardt committed
Aug 22, 2024 at 08:35 UTC
22f519a9a058fc0cf05e4bdd7a20adee13668150
3 files changed
+22
-24
reftable/reader.c
-21
@@ -798,27 +798,6 @@ void reftable_table_from_reader(struct reftable_table *tab,
798
tab->table_arg = reader;
799
}
800
801
-
802
-int reftable_reader_print_file(const char *tablename)
803
-{
804
- struct reftable_block_source src = { NULL };
805
- int err = reftable_block_source_from_file(&src, tablename);
806
- struct reftable_reader *r = NULL;
807
- struct reftable_table tab = { NULL };
808
- if (err < 0)
809
- goto done;
810
-
811
- err = reftable_new_reader(&r, &src, tablename);
812
- if (err < 0)
813
- goto done;
814
-
815
- reftable_table_from_reader(&tab, r);
816
- err = reftable_table_print(&tab);
817
-done:
818
- reftable_reader_free(r);
819
- return err;
820
-}
821
-
801
int reftable_reader_print_blocks(const char *tablename)
802
{
803
struct {
reftable/reftable-reader.h
-2
@@ -64,8 +64,6 @@ uint64_t reftable_reader_min_update_index(struct reftable_reader *r);
64
void reftable_table_from_reader(struct reftable_table *tab,
65
struct reftable_reader *reader);
66
67
-/* print table onto stdout for debugging. */
68
-int reftable_reader_print_file(const char *tablename);
67
/* print blocks onto stdout for debugging. */
68
int reftable_reader_print_blocks(const char *tablename);
69
t/helper/test-reftable.c
+22
-1
@@ -1,5 +1,6 @@
1
#include "reftable/system.h"
2
#include "reftable/reftable-error.h"
3
+#include "reftable/reftable-generic.h"
4
#include "reftable/reftable-reader.h"
5
#include "reftable/reftable-stack.h"
6
#include "reftable/reftable-tests.h"
@@ -28,6 +29,26 @@ static void print_help(void)
29
"\n");
30
}
31
32
+static int dump_reftable(const char *tablename)
33
+{
34
+ struct reftable_block_source src = { NULL };
35
+ int err = reftable_block_source_from_file(&src, tablename);
36
+ struct reftable_reader *r = NULL;
37
+ struct reftable_table tab = { NULL };
38
+ if (err < 0)
39
+ goto done;
40
+
41
+ err = reftable_new_reader(&r, &src, tablename);
42
+ if (err < 0)
43
+ goto done;
44
+
45
+ reftable_table_from_reader(&tab, r);
46
+ err = reftable_table_print(&tab);
47
+done:
48
+ reftable_reader_free(r);
49
+ return err;
50
+}
51
+
52
int cmd__dump_reftable(int argc, const char **argv)
53
{
54
int err = 0;
@@ -64,7 +85,7 @@ int cmd__dump_reftable(int argc, const char **argv)
85
if (opt_dump_blocks) {
86
err = reftable_reader_print_blocks(arg);
87
} else if (opt_dump_table) {
67
- err = reftable_reader_print_file(arg);
88
+ err = dump_reftable(arg);
89
} else if (opt_dump_stack) {
90
err = reftable_stack_print_directory(arg, opt_hash_id);
91
}