diff options
| author | Jeff King <peff@peff.net> | 2017-08-10 14:03:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-10 12:41:25 -0700 |
| commit | 8abc89800c09cda7910c2211ebbbbb95a3008b63 (patch) | |
| tree | 5b44f9610fdcc743b0bf5257a072ff2477757797 /builtin | |
| parent | cf8899d285d2648013040ec7196ffd3de0606664 (diff) | |
| download | git-8abc89800c09cda7910c2211ebbbbb95a3008b63.tar.gz git-8abc89800c09cda7910c2211ebbbbb95a3008b63.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/interpret-trailers.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index 175f14797..bb0d7b937 100644 --- 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 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[] = { - 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() @@ -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++) - process_trailers(argv[i], in_place, trim_empty, &trailers); + process_trailers(argv[i], &opts, &trailers); } else { - if (in_place) + if (opts.in_place) 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); |