trailer: put process_trailers() options into a struct

We already have two options and are about to add a few more.
To avoid having a huge number of boolean arguments, let's
convert to an options struct which can be passed in.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 175f14797b101d22ead9d1008744440da66a7c1c..bb0d7b937a9e2610ae35e5ae52a3ac7fffc6d134 100644 (file)
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -18,13 +18,12 @@ static const char * const git_interpret_trailers_usage[] = {
 
 int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 {

-       int in_place = 0;
-       int trim_empty = 0;
+       struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;

        struct string_list trailers = STRING_LIST_INIT_NODUP;
 
        struct option options[] = {
        struct string_list trailers = STRING_LIST_INIT_NODUP;
 
        struct option options[] = {

-               OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
-               OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
+               OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
+               OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),

                OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
                                N_("trailer(s) to add")),
                OPT_END()
                OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
                                N_("trailer(s) to add")),
                OPT_END()


@@ -36,11 +35,11 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
        if (argc) {
                int i;
                for (i = 0; i < argc; i++)
        if (argc) {
                int i;
                for (i = 0; i < argc; i++)

-                       process_trailers(argv[i], in_place, trim_empty, &trailers);
+                       process_trailers(argv[i], &opts, &trailers);

        } else {
        } else {

-               if (in_place)
+               if (opts.in_place)

                        die(_("no input file given for in-place editing"));
                        die(_("no input file given for in-place editing"));

-               process_trailers(NULL, in_place, trim_empty, &trailers);
+               process_trailers(NULL, &opts, &trailers);

        }
 
        string_list_clear(&trailers, 0);
        }
 
        string_list_clear(&trailers, 0);

diff --git a/trailer.c b/trailer.c
index 11f0b9fb40bcedbfcd3111fa8076ce0d9e1eb20f..9bcd54e813d94e02d08de9ab18cdee467a2e6729 100644 (file)
--- a/trailer.c
+++ b/trailer.c
@@ -967,7 +967,9 @@ static FILE *create_in_place_tempfile(const char *file)
        return outfile;
 }
 
        return outfile;
 }
 

-void process_trailers(const char *file, int in_place, int trim_empty, struct string_list *trailers)
+void process_trailers(const char *file,
+                     const struct process_trailer_options *opts,
+                     struct string_list *trailers)

 {
        LIST_HEAD(head);
        LIST_HEAD(arg_head);
 {
        LIST_HEAD(head);
        LIST_HEAD(arg_head);


@@ -979,7 +981,7 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str
 
        read_input_file(&sb, file);
 
 
        read_input_file(&sb, file);
 

-       if (in_place)
+       if (opts->in_place)

                outfile = create_in_place_tempfile(file);
 
        /* Print the lines before the trailers */
                outfile = create_in_place_tempfile(file);
 
        /* Print the lines before the trailers */


@@ -989,14 +991,14 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str
 
        process_trailers_lists(&head, &arg_head);
 
 
        process_trailers_lists(&head, &arg_head);
 

-       print_all(outfile, &head, trim_empty);
+       print_all(outfile, &head, opts->trim_empty);

 
        free_all(&head);
 
        /* Print the lines after the trailers as is */
        fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
 
 
        free_all(&head);
 
        /* Print the lines after the trailers as is */
        fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
 

-       if (in_place)
+       if (opts->in_place)

                if (rename_tempfile(&trailers_tempfile, file))
                        die_errno(_("could not rename temporary file to %s"), file);
 
                if (rename_tempfile(&trailers_tempfile, file))
                        die_errno(_("could not rename temporary file to %s"), file);
 

diff --git a/trailer.h b/trailer.h
index 65cc5d79c6cecfce5cf3302dd7dcb6323f9f85dc..9da00bedecdbfe2f7c69f7be5a88a61225c0a3fe 100644 (file)
--- a/trailer.h
+++ b/trailer.h
@@ -22,7 +22,15 @@ struct trailer_info {
        size_t trailer_nr;
 };
 
        size_t trailer_nr;
 };
 

-void process_trailers(const char *file, int in_place, int trim_empty,
+struct process_trailer_options {
+       int in_place;
+       int trim_empty;
+};
+
+#define PROCESS_TRAILER_OPTIONS_INIT {0}
+
+void process_trailers(const char *file,
+                     const struct process_trailer_options *opts,

                      struct string_list *trailers);
 
 void trailer_info_get(struct trailer_info *info, const char *str);
                      struct string_list *trailers);
 
 void trailer_info_get(struct trailer_info *info, const char *str);