v11, 40 partsbuiltin/apply: rename option parsing functions

> to the apply API.
> 
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/apply.c | 40 ++++++++++++++++++++--------------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/builtin/apply.c b/builtin/apply.c
> index ad403f8..429fe44 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -4588,16 +4588,16 @@ static int apply_patch(struct apply_state *state,
>  	return res;
>  }
>  
> -static int option_parse_exclude(const struct option *opt,
> -				const char *arg, int unset)
> +static int apply_option_parse_exclude(const struct option *opt,
> +				      const char *arg, int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	add_name_limit(state, arg, 1);
>  	return 0;
>  }
>  
> -static int option_parse_include(const struct option *opt,
> -				const char *arg, int unset)
> +static int apply_option_parse_include(const struct option *opt,
> +				      const char *arg, int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	add_name_limit(state, arg, 0);
> @@ -4605,9 +4605,9 @@ static int option_parse_include(const struct option *opt,
>  	return 0;
>  }
>  
> -static int option_parse_p(const struct option *opt,
> -			  const char *arg,
> -			  int unset)
> +static int apply_option_parse_p(const struct option *opt,
> +				const char *arg,
> +				int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	state->p_value = atoi(arg);
> @@ -4615,8 +4615,8 @@ static int option_parse_p(const struct option *opt,
>  	return 0;
>  }
>  
> -static int option_parse_space_change(const struct option *opt,
> -				     const char *arg, int unset)
> +static int apply_option_parse_space_change(const struct option *opt,
> +					   const char *arg, int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	if (unset)
> @@ -4626,8 +4626,8 @@ static int option_parse_space_change(const struct option *opt,
>  	return 0;
>  }
>  
> -static int option_parse_whitespace(const struct option *opt,
> -				   const char *arg, int unset)
> +static int apply_option_parse_whitespace(const struct option *opt,
> +					 const char *arg, int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	state->whitespace_option = arg;
> @@ -4636,8 +4636,8 @@ static int option_parse_whitespace(const struct option *opt,
>  	return 0;
>  }
>  
> -static int option_parse_directory(const struct option *opt,
> -				  const char *arg, int unset)
> +static int apply_option_parse_directory(const struct option *opt,
> +					const char *arg, int unset)
>  {
>  	struct apply_state *state = opt->value;
>  	strbuf_reset(&state->root);
> @@ -4755,13 +4755,13 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
>  	struct option builtin_apply_options[] = {
>  		{ OPTION_CALLBACK, 0, "exclude", &state, N_("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"),
>  			N_("apply changes matching the given path"),
> -			0, option_parse_include },
> +			0, apply_option_parse_include },
>  		{ OPTION_CALLBACK, 'p', NULL, &state, N_("num"),
>  			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,
>  			N_("ignore additions made by the patch")),
>  		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")),
>  		{ OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
>  			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,
>  			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,
>  			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,
>  			N_("apply the patch in reverse")),
>  		OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
> @@ -4817,7 +4817,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
>  			RECOUNT),
>  		{ OPTION_CALLBACK, 0, "directory", &state, N_("root"),
>  			N_("prepend <root> to all filenames"),
> -			0, option_parse_directory },
> +			0, apply_option_parse_directory },
>  		OPT_END()
>  	};
>  
> 

> Am 11.08.2016 um 10:52 schrieb Christian Couder:
>> As these functions are going to be part of the libified
>> apply api, let's give them a name that is more specific
>
> s/api/API/
>
> ;-)