mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format-patch: use OPT_STRING_LIST for to/cc options

Browse Source 
The to_callback() and cc_callback() functions are identical to the
generic parse_opt_string_list() function (except that they don't handle
optional arguments, but that's OK because their callers do not use the
OPTARG flag).

Let's simplify the code by using OPT_STRING_LIST.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-08-31 17:17:33 -04:00
committed by Junio C Hamano
parent 7fa701106d
commit 3ccb4c55ad
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/log.c
View File

@ -1567,24 +1567,6 @@ static int header_callback(const struct option *opt, const char *arg, int unset)
return 0; return 0;
} }
static int to_callback(const struct option *opt, const char *arg, int unset)
{
if (unset)
string_list_clear(&extra_to, 0);
else
string_list_append(&extra_to, arg);
return 0;
}
static int cc_callback(const struct option *opt, const char *arg, int unset)
{
if (unset)
string_list_clear(&extra_cc, 0);
else
string_list_append(&extra_cc, arg);
return 0;
}
static int from_callback(const struct option *opt, const char *arg, int unset) static int from_callback(const struct option *opt, const char *arg, int unset)
{ {
char **from = opt->value; char **from = opt->value;
@ -1957,8 +1939,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
OPT_GROUP(N_("Messaging")), OPT_GROUP(N_("Messaging")),
OPT_CALLBACK(0, "add-header", NULL, N_("header"), OPT_CALLBACK(0, "add-header", NULL, N_("header"),
N_("add email header"), header_callback), N_("add email header"), header_callback),
OPT_CALLBACK(0, "to", NULL, N_("email"), N_("add To: header"), to_callback), OPT_STRING_LIST(0, "to", &extra_to, N_("email"), N_("add To: header")),
OPT_CALLBACK(0, "cc", NULL, N_("email"), N_("add Cc: header"), cc_callback), OPT_STRING_LIST(0, "cc", &extra_cc, N_("email"), N_("add Cc: header")),
OPT_CALLBACK_F(0, "from", &from, N_("ident"), OPT_CALLBACK_F(0, "from", &from, N_("ident"),
N_("set From address to <ident> (or committer ident if absent)"), N_("set From address to <ident> (or committer ident if absent)"),
PARSE_OPT_OPTARG, from_callback), PARSE_OPT_OPTARG, from_callback),