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

builtin/apply: rename option parsing functions

Browse Source 
As these functions are going to be part of the libified
apply API, let's give them a name that is more specific
to the apply API.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2016-09-04 22:18:20 +02:00
committed by Junio C Hamano
parent 603752a88d
commit da8e30dcd9
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
builtin/apply.c
View File

@ -4588,16 +4588,16 @@ end:
return res; return res;
} }
static int option_parse_exclude(const struct option *opt, static int apply_option_parse_exclude(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
add_name_limit(state, arg, 1); add_name_limit(state, arg, 1);
return 0; return 0;
} }
static int option_parse_include(const struct option *opt, static int apply_option_parse_include(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
add_name_limit(state, arg, 0); add_name_limit(state, arg, 0);
@ -4605,9 +4605,9 @@ static int option_parse_include(const struct option *opt,
return 0; return 0;
} }
static int option_parse_p(const struct option *opt, static int apply_option_parse_p(const struct option *opt,
const char *arg, const char *arg,
int unset) int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
state->p_value = atoi(arg); state->p_value = atoi(arg);
@ -4615,8 +4615,8 @@ static int option_parse_p(const struct option *opt,
return 0; return 0;
} }
static int option_parse_space_change(const struct option *opt, static int apply_option_parse_space_change(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
if (unset) if (unset)
@ -4626,8 +4626,8 @@ static int option_parse_space_change(const struct option *opt,
return 0; return 0;
} }
static int option_parse_whitespace(const struct option *opt, static int apply_option_parse_whitespace(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
state->whitespace_option = arg; state->whitespace_option = arg;
@ -4636,8 +4636,8 @@ static int option_parse_whitespace(const struct option *opt,
return 0; return 0;
} }
static int option_parse_directory(const struct option *opt, static int apply_option_parse_directory(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
strbuf_reset(&state->root); strbuf_reset(&state->root);
@ -4755,13 +4755,13 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
struct option builtin_apply_options[] = { struct option builtin_apply_options[] = {
{ OPTION_CALLBACK, 0, "exclude", &state, N_("path"), { OPTION_CALLBACK, 0, "exclude", &state, N_("path"),
N_("don't apply changes matching the given path"), N_("don't apply changes matching the given path"),
0, option_parse_exclude }, 0, apply_option_parse_exclude },
{ OPTION_CALLBACK, 0, "include", &state, N_("path"), { OPTION_CALLBACK, 0, "include", &state, N_("path"),
N_("apply changes matching the given path"), N_("apply changes matching the given path"),
0, option_parse_include }, 0, apply_option_parse_include },
{ OPTION_CALLBACK, 'p', NULL, &state, N_("num"), { OPTION_CALLBACK, 'p', NULL, &state, N_("num"),
N_("remove <num> leading slashes from traditional diff paths"), N_("remove <num> leading slashes from traditional diff paths"),
0, option_parse_p }, 0, apply_option_parse_p },
OPT_BOOL(0, "no-add", &state.no_add, OPT_BOOL(0, "no-add", &state.no_add,
N_("ignore additions made by the patch")), N_("ignore additions made by the patch")),
OPT_BOOL(0, "stat", &state.diffstat, OPT_BOOL(0, "stat", &state.diffstat,
@ -4793,13 +4793,13 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
N_("ensure at least <n> lines of context match")), N_("ensure at least <n> lines of context match")),
{ OPTION_CALLBACK, 0, "whitespace", &state, N_("action"), { OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
N_("detect new or modified lines that have whitespace errors"), N_("detect new or modified lines that have whitespace errors"),
0, option_parse_whitespace }, 0, apply_option_parse_whitespace },
{ OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL, { OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL,
N_("ignore changes in whitespace when finding context"), N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change }, PARSE_OPT_NOARG, apply_option_parse_space_change },
{ OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL, { OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL,
N_("ignore changes in whitespace when finding context"), N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change }, PARSE_OPT_NOARG, apply_option_parse_space_change },
OPT_BOOL('R', "reverse", &state.apply_in_reverse, OPT_BOOL('R', "reverse", &state.apply_in_reverse,
N_("apply the patch in reverse")), N_("apply the patch in reverse")),
OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero, OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
@ -4817,7 +4817,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
RECOUNT), RECOUNT),
{ OPTION_CALLBACK, 0, "directory", &state, N_("root"), { OPTION_CALLBACK, 0, "directory", &state, N_("root"),
N_("prepend <root> to all filenames"), N_("prepend <root> to all filenames"),
0, option_parse_directory }, 0, apply_option_parse_directory },
OPT_END() OPT_END()
}; };