From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH v3 1/5] trailer: put process_trailers() options into a struct
Date: Thu, 10 Aug 2017 14:03:58 -0400 [thread overview]
Message-ID: <20170810180358.xym3cj2p6qgtrpmg@sigill.intra.peff.net> (raw)
In-Reply-To: <20170810180326.4kkmawywvdbuzwnp@sigill.intra.peff.net>
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>
---
builtin/interpret-trailers.c | 13 ++++++-------
trailer.c | 10 ++++++----
trailer.h | 10 +++++++++-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 175f14797b..bb0d7b937a 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);
diff --git a/trailer.c b/trailer.c
index 751b56c009..e21a0d1629 100644
--- a/trailer.c
+++ b/trailer.c
@@ -968,7 +968,9 @@ 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,
+ const struct process_trailer_options *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->trim_empty);
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 65cc5d79c6..9da00bedec 100644
--- a/trailer.h
+++ b/trailer.h
@@ -22,7 +22,15 @@ struct trailer_info {
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);
--
2.14.0.614.g0beb26d5e9
next prev parent reply other threads:[~2017-08-10 18:04 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 12:21 [PATCH 0/5] make interpret-trailers useful for parsing Jeff King
2017-08-09 12:22 ` [PATCH 1/5] trailer: put process_trailers() options into a struct Jeff King
2017-08-09 12:24 ` [PATCH 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-09 17:52 ` Stefan Beller
2017-08-09 17:55 ` Stefan Beller
2017-08-09 18:35 ` Jonathan Tan
2017-08-10 7:40 ` Jeff King
2017-08-09 12:24 ` [PATCH 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-09 18:18 ` Stefan Beller
2017-08-10 7:32 ` Jeff King
2017-08-10 17:27 ` Stefan Beller
2017-08-10 17:33 ` Jeff King
2017-08-10 17:38 ` Stefan Beller
2017-08-10 18:43 ` Junio C Hamano
2017-08-09 18:38 ` Jonathan Tan
2017-08-10 7:36 ` Jeff King
2017-08-09 12:25 ` [PATCH 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-09 12:26 ` [PATCH 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-09 18:20 ` Stefan Beller
2017-08-10 7:59 ` Jeff King
2017-08-09 17:19 ` [PATCH 0/5] make interpret-trailers useful for parsing Junio C Hamano
2017-08-10 7:04 ` Jacob Keller
2017-08-10 7:28 ` Jeff King
2017-08-10 18:42 ` Junio C Hamano
2017-08-13 19:03 ` Jacob Keller
2017-08-10 8:02 ` Jeff King
2017-08-10 8:03 ` [PATCH 1/5] trailer: put process_trailers() options into a struct Jeff King
2017-08-10 8:03 ` [PATCH 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-10 8:03 ` [PATCH 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-10 8:03 ` [PATCH 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-10 18:35 ` Stefan Beller
2017-08-10 18:37 ` Jeff King
2017-08-10 19:39 ` Christian Couder
2017-08-10 19:42 ` Jeff King
2017-08-10 20:26 ` Christian Couder
2017-08-10 19:44 ` Stefan Beller
2017-08-10 21:06 ` Christian Couder
2017-08-10 21:10 ` Jeff King
2017-08-10 23:02 ` Ramsay Jones
2017-08-10 23:10 ` Jeff King
2017-08-10 23:36 ` Ramsay Jones
2017-08-11 7:02 ` Christian Couder
2017-08-11 9:06 ` Jeff King
2017-08-11 19:02 ` Christian Couder
2017-08-10 8:03 ` [PATCH 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-10 18:03 ` [PATCH 0/5] make interpret-trailers useful for parsing Jeff King
2017-08-10 18:03 ` Jeff King [this message]
2017-08-10 18:04 ` [PATCH v3 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-10 18:28 ` Stefan Beller
2017-08-10 18:31 ` Jeff King
2017-08-10 18:49 ` Junio C Hamano
2017-08-10 18:04 ` [PATCH v3 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-10 18:04 ` [PATCH v3 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-10 18:04 ` [PATCH v3 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-10 18:35 ` [PATCH 0/5] make interpret-trailers useful for parsing Stefan Beller
2017-08-10 19:43 ` Junio C Hamano
2017-08-15 10:22 ` [PATCH v4 0/8] trailer parsing via interpret-trailers and %(trailers) Jeff King
2017-08-15 10:23 ` [PATCH v4 1/8] trailer: put process_trailers() options into a struct Jeff King
2017-08-15 10:23 ` [PATCH v4 2/8] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-15 10:23 ` [PATCH v4 3/8] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-15 10:23 ` [PATCH v4 4/8] interpret-trailers: add an option to unfold values Jeff King
2017-08-15 10:23 ` [PATCH v4 5/8] interpret-trailers: add --parse convenience option Jeff King
2017-08-15 11:26 ` Martin Ågren
2017-08-16 8:20 ` Jeff King
2017-08-17 18:19 ` Martin Ågren
2017-08-15 10:23 ` [PATCH v4 6/8] pretty: move trailer formatting to trailer.c Jeff King
2017-08-15 10:24 ` [PATCH v4 7/8] t4205: refactor %(trailers) tests Jeff King
2017-08-15 10:25 ` [PATCH v4 8/8] pretty: support normalization options for %(trailers) Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170810180358.xym3cj2p6qgtrpmg@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).