cat-file: move batch_options definition to top of file

That way all of the functions can make use of it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 22, 2015 at 06:41 UTC bfd155943eecedb7b7e759ff022ca09e68f941b0
1 file changed +7 -6
builtin/cat-file.c
+7 -6
@@ -10,6 +10,13 @@
10 #include "streaming.h"
11 #include "tree-walk.h"
12
13 +struct batch_options {
14 + int enabled;
15 + int follow_symlinks;
16 + int print_contents;
17 + const char *format;
18 +};
19 +
20 static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
21 int unknown_type)
22 {
@@ -232,12 +239,6 @@ static void print_object_or_die(int fd, struct expand_data *data)
239 }
240 }
241
235 -struct batch_options {
236 - int enabled;
237 - int follow_symlinks;
238 - int print_contents;
239 - const char *format;
240 -};
242
243 static int batch_one_object(const char *obj_name, struct batch_options *opt,
244 struct expand_data *data)