t/helper: inline `reftable_dump_main()`

The printing functionality part of `reftable/dump.c` is really only used
by our "dump-reftable" test helper. It is certainly not generic logic
that is useful to anybody outside of Git, and the format it generates is
quite specific. Still, parts of it are used in our test suite and the
output may be useful to take a peek into reftable stacks, tables and
blocks. So while it does not make sense to expose this as part of the
reftable library, it does make sense to keep it around.

Inline the `reftable_dump_main()` function into the "dump-reftable" test
helper. This clarifies that its format is subject to change and not part
of our public interface. Furthermore, this allows us to iterate on the
implementation in subsequent patches.

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

diff --git a/Makefile b/Makefile
index 3863e60b6641897f9923ac41cb0140e58de5f46a..343f19a488b0f329a53809496e649d678668e5ef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2680,7 +2680,6 @@ REFTABLE_OBJS += reftable/tree.o
 REFTABLE_OBJS += reftable/writer.o
 
 REFTABLE_TEST_OBJS += reftable/block_test.o
-REFTABLE_TEST_OBJS += reftable/dump.o
 REFTABLE_TEST_OBJS += reftable/pq_test.o
 REFTABLE_TEST_OBJS += reftable/readwrite_test.o
 REFTABLE_TEST_OBJS += reftable/stack_test.o

diff --git a/reftable/dump.c b/reftable/dump.c
deleted file mode 100644 (file)
index 391d93d..0000000
--- a/reftable/dump.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright 2020 Google LLC
-
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file or at
-https://developers.google.com/open-source/licenses/bsd
-*/
-
-#include "git-compat-util.h"
-#include "hash.h"
-
-#include "reftable-blocksource.h"
-#include "reftable-error.h"
-#include "reftable-record.h"
-#include "reftable-tests.h"
-#include "reftable-writer.h"
-#include "reftable-iterator.h"
-#include "reftable-reader.h"
-#include "reftable-stack.h"
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-static void print_help(void)
-{
-       printf("usage: dump [-st] arg\n\n"
-              "options: \n"
-              "  -b dump blocks\n"
-              "  -t dump table\n"
-              "  -s dump stack\n"
-              "  -6 sha256 hash format\n"
-              "  -h this help\n"
-              "\n");
-}
-
-int reftable_dump_main(int argc, char *const *argv)
-{
-       int err = 0;
-       int opt_dump_blocks = 0;
-       int opt_dump_table = 0;
-       int opt_dump_stack = 0;
-       uint32_t opt_hash_id = GIT_SHA1_FORMAT_ID;
-       const char *arg = NULL, *argv0 = argv[0];
-
-       for (; argc > 1; argv++, argc--)
-               if (*argv[1] != '-')
-                       break;
-               else if (!strcmp("-b", argv[1]))
-                       opt_dump_blocks = 1;
-               else if (!strcmp("-t", argv[1]))
-                       opt_dump_table = 1;
-               else if (!strcmp("-6", argv[1]))
-                       opt_hash_id = GIT_SHA256_FORMAT_ID;
-               else if (!strcmp("-s", argv[1]))
-                       opt_dump_stack = 1;
-               else if (!strcmp("-?", argv[1]) || !strcmp("-h", argv[1])) {
-                       print_help();
-                       return 2;
-               }
-
-       if (argc != 2) {
-               fprintf(stderr, "need argument\n");
-               print_help();
-               return 2;
-       }
-
-       arg = argv[1];
-
-       if (opt_dump_blocks) {
-               err = reftable_reader_print_blocks(arg);
-       } else if (opt_dump_table) {
-               err = reftable_reader_print_file(arg);
-       } else if (opt_dump_stack) {
-               err = reftable_stack_print_directory(arg, opt_hash_id);
-       }
-
-       if (err < 0) {
-               fprintf(stderr, "%s: %s: %s\n", argv0, arg,
-                       reftable_error_str(err));
-               return 1;
-       }
-       return 0;
-}

diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h
index d5e03dcc1b6852303147f6857a1fc51f0587133c..d005a8bb9e1589fff2fb8f8195abab0ce27520b8 100644 (file)
--- a/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@ -16,6 +16,5 @@ int record_test_main(int argc, const char **argv);
 int readwrite_test_main(int argc, const char **argv);
 int stack_test_main(int argc, const char **argv);
 int tree_test_main(int argc, const char **argv);
-int reftable_dump_main(int argc, char *const *argv);
 
 #endif

diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
index 9d378427da91d6a235061489a06b30fe65fdafc4..7f37d0cd34b8f5a0cc9aeab4f47f1a02bcf7c709 100644 (file)
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@ -1,4 +1,7 @@
 #include "reftable/system.h"
+#include "reftable/reftable-error.h"
+#include "reftable/reftable-reader.h"
+#include "reftable/reftable-stack.h"
 #include "reftable/reftable-tests.h"
 #include "test-tool.h"
 
@@ -13,7 +16,63 @@ int cmd__reftable(int argc, const char **argv)
        return 0;
 }
 
+static void print_help(void)
+{
+       printf("usage: dump [-st] arg\n\n"
+              "options: \n"
+              "  -b dump blocks\n"
+              "  -t dump table\n"
+              "  -s dump stack\n"
+              "  -6 sha256 hash format\n"
+              "  -h this help\n"
+              "\n");
+}
+
 int cmd__dump_reftable(int argc, const char **argv)
 {
-       return reftable_dump_main(argc, (char *const *)argv);
+       int err = 0;
+       int opt_dump_blocks = 0;
+       int opt_dump_table = 0;
+       int opt_dump_stack = 0;
+       uint32_t opt_hash_id = GIT_SHA1_FORMAT_ID;
+       const char *arg = NULL, *argv0 = argv[0];
+
+       for (; argc > 1; argv++, argc--)
+               if (*argv[1] != '-')
+                       break;
+               else if (!strcmp("-b", argv[1]))
+                       opt_dump_blocks = 1;
+               else if (!strcmp("-t", argv[1]))
+                       opt_dump_table = 1;
+               else if (!strcmp("-6", argv[1]))
+                       opt_hash_id = GIT_SHA256_FORMAT_ID;
+               else if (!strcmp("-s", argv[1]))
+                       opt_dump_stack = 1;
+               else if (!strcmp("-?", argv[1]) || !strcmp("-h", argv[1])) {
+                       print_help();
+                       return 2;
+               }
+
+       if (argc != 2) {
+               fprintf(stderr, "need argument\n");
+               print_help();
+               return 2;
+       }
+
+       arg = argv[1];
+
+       if (opt_dump_blocks) {
+               err = reftable_reader_print_blocks(arg);
+       } else if (opt_dump_table) {
+               err = reftable_reader_print_file(arg);
+       } else if (opt_dump_stack) {
+               err = reftable_stack_print_directory(arg, opt_hash_id);
+       }
+
+       if (err < 0) {
+               fprintf(stderr, "%s: %s: %s\n", argv0, arg,
+                       reftable_error_str(err));
+               return 1;
+       }
+       return 0;
 }