зеркало из https://github.com/microsoft/git.git
apply: make some parsing functions static again
Some parsing functions that were used in both "apply.c" and "builtin/apply.c" are now only used in the former, so they can be made static to "apply.c". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
13b5af22f3
Коммит
9123d5ddfe
6
apply.c
6
apply.c
|
@ -27,7 +27,7 @@ static void git_apply_config(void)
|
|||
git_config(git_default_config, NULL);
|
||||
}
|
||||
|
||||
int parse_whitespace_option(struct apply_state *state, const char *option)
|
||||
static int parse_whitespace_option(struct apply_state *state, const char *option)
|
||||
{
|
||||
if (!option) {
|
||||
state->ws_error_action = warn_on_ws_error;
|
||||
|
@ -57,8 +57,8 @@ int parse_whitespace_option(struct apply_state *state, const char *option)
|
|||
return error(_("unrecognized whitespace option '%s'"), option);
|
||||
}
|
||||
|
||||
int parse_ignorewhitespace_option(struct apply_state *state,
|
||||
const char *option)
|
||||
static int parse_ignorewhitespace_option(struct apply_state *state,
|
||||
const char *option)
|
||||
{
|
||||
if (!option || !strcmp(option, "no") ||
|
||||
!strcmp(option, "false") || !strcmp(option, "never") ||
|
||||
|
|
5
apply.h
5
apply.h
|
@ -97,11 +97,6 @@ struct apply_state {
|
|||
int applied_after_fixing_ws;
|
||||
};
|
||||
|
||||
extern int parse_whitespace_option(struct apply_state *state,
|
||||
const char *option);
|
||||
extern int parse_ignorewhitespace_option(struct apply_state *state,
|
||||
const char *option);
|
||||
|
||||
extern int apply_option_parse_exclude(const struct option *opt,
|
||||
const char *arg, int unset);
|
||||
extern int apply_option_parse_include(const struct option *opt,
|
||||
|
|
Загрузка…
Ссылка в новой задаче