[PATCH 1/3] trailers: create struct trailer_opts
- From
Paolo Bonzini <bonzini@gnu.org>
- Date
- Jul 12, 2017, 13:46 UTC
- Message-ID
- <20170712134646.17179-2-bonzini@gnu.org>
- In-Reply-To
- <20170712134646.17179-1-bonzini@gnu.org>
From: Paolo Bonzini <pbonzini@redhat.com>
Pass the command-line arguments as a pointer to a new struct. This will be extended soon to include more options.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- builtin/interpret-trailers.c | 13 ++++++------- trailer.c | 14 ++++++++------ trailer.h | 7 ++++++- 3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index 175f14797..6528680b5 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 trailer_opts opts = { 0 }; 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); diff --git a/trailer.c b/trailer.c index 751b56c00..a3eb42818 100644 --- a/trailer.c +++ b/trailer.c @@ -164,13 +164,14 @@ static void print_tok_val(FILE *outfile, const char *tok, const char *val) fprintf(outfile, "%s%c %s\n", tok, separators[0], val); } -static void print_all(FILE *outfile, struct list_head *head, int trim_empty) +static void print_all(FILE *outfile, struct list_head *head, + struct trailer_opts *opts) { struct list_head *pos; struct trailer_item *item; list_for_each(pos, head) { item = list_entry(pos, struct trailer_item, list); - if (!trim_empty || strlen(item->value) > 0) + if (!opts->trim_empty || strlen(item->value) > 0) print_tok_val(outfile, item->token, item->value); } } @@ -968,7 +969,8 @@ static FILE *create_in_place_tempfile(const char *file) return outfile; } -void process_trailers(const char *file, int in_place, int trim_empty, struct string_list *trailers) +void process_trailers(const char *file, struct trailer_opts *opts, + struct string_list *trailers) { LIST_HEAD(head); LIST_HEAD(arg_head); @@ -980,7 +982,7 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str read_input_file(&sb, file); - if (in_place) + if (opts->in_place) outfile = create_in_place_tempfile(file); /* Print the lines before the trailers */ @@ -990,14 +992,14 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str process_trailers_lists(&head, &arg_head); - print_all(outfile, &head, trim_empty); + print_all(outfile, &head, opts); 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); diff --git a/trailer.h b/trailer.h index 65cc5d79c..e90ba1270 100644 --- a/trailer.h +++ b/trailer.h @@ -1,6 +1,11 @@ #ifndef TRAILER_H #define TRAILER_H +struct trailer_opts { + int in_place; + int trim_empty; +}; + struct trailer_info { /* * True if there is a blank line before the location pointed to by @@ -22,7 +27,7 @@ struct trailer_info { size_t trailer_nr; }; -void process_trailers(const char *file, int in_place, int trim_empty, +void process_trailers(const char *file, struct trailer_opts *opts, struct string_list *trailers); void trailer_info_get(struct trailer_info *info, const char *str);
-- 2.13.0