Skip to content

Commit 22f519a

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2b06b28 commit 22f519a

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

reftable/reader.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -798,27 +798,6 @@ void reftable_table_from_reader(struct reftable_table *tab,
798798
tab->table_arg = reader;
799799
}
800800

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-
822801
int reftable_reader_print_blocks(const char *tablename)
823802
{
824803
struct {

reftable/reftable-reader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ uint64_t reftable_reader_min_update_index(struct reftable_reader *r);
6464
void reftable_table_from_reader(struct reftable_table *tab,
6565
struct reftable_reader *reader);
6666

67-
/* print table onto stdout for debugging. */
68-
int reftable_reader_print_file(const char *tablename);
6967
/* print blocks onto stdout for debugging. */
7068
int reftable_reader_print_blocks(const char *tablename);
7169

t/helper/test-reftable.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "reftable/system.h"
22
#include "reftable/reftable-error.h"
3+
#include "reftable/reftable-generic.h"
34
#include "reftable/reftable-reader.h"
45
#include "reftable/reftable-stack.h"
56
#include "reftable/reftable-tests.h"
@@ -28,6 +29,26 @@ static void print_help(void)
2829
"\n");
2930
}
3031

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+
3152
int cmd__dump_reftable(int argc, const char **argv)
3253
{
3354
int err = 0;
@@ -64,7 +85,7 @@ int cmd__dump_reftable(int argc, const char **argv)
6485
if (opt_dump_blocks) {
6586
err = reftable_reader_print_blocks(arg);
6687
} else if (opt_dump_table) {
67-
err = reftable_reader_print_file(arg);
88+
err = dump_reftable(arg);
6889
} else if (opt_dump_stack) {
6990
err = reftable_stack_print_directory(arg, opt_hash_id);
7091
}

0 commit comments

Comments
 (0)