It would be useful for a future patch to use these definitions so moving
them higher.
---
builtin/cat-file.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 50cf38999d..cfe74c36eb 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -34,6 +34,8 @@ struct batch_options {
const char *format;
};
+#define DEFAULT_FORMAT "%(objectname) %(objecttype) %(objectsize)"
+
static const char *force_path;
static int filter_object(const char *path, unsigned mode,
@@ -556,6 +558,16 @@ static void parse_cmd_info(struct batch_options *opt,
batch_one_object(line, output, opt, data);
}
+static const struct parse_cmd {
+ const char *name;
+ parse_cmd_fn_t fn;
+ unsigned takes_args;
+} commands[] = {
+ { "contents", parse_cmd_contents, 1},
+ { "info", parse_cmd_info, 1},
+ { "flush", NULL, 0},
+};
+
static void dispatch_calls(struct batch_options *opt,
struct strbuf *output,
struct expand_data *data,
@@ -583,17 +595,6 @@ static void free_cmds(struct queued_cmd *cmd, size_t *nr)
*nr = 0;
}
-
-static const struct parse_cmd {
- const char *name;
- parse_cmd_fn_t fn;
- unsigned takes_args;
-} commands[] = {
- { "contents", parse_cmd_contents, 1},
- { "info", parse_cmd_info, 1},
- { "flush", NULL, 0},
-};
-
static void batch_objects_command(struct batch_options *opt,
struct strbuf *output,
struct expand_data *data)
@@ -659,8 +660,6 @@ static void batch_objects_command(struct batch_options *opt,
strbuf_release(&input);
}
-#define DEFAULT_FORMAT "%(objectname) %(objecttype) %(objectsize)"
-
static int batch_objects(struct batch_options *opt)
{
struct strbuf input = STRBUF_INIT;
--
2.36.0.rc2.10170.gb555eefa6f
