Re: [PATCH v11 28/40] builtin/apply: rename option parsing functions

[Christian Couder]

On Thu, Aug 11, 2016 at 10:58 AM,   wrote:
> 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/
>
> ;-)

Ooops.
Anyway as this is patch 28/40 and the other problem you found is in
40/40, I will just resend patches from 28/40 to 40/40 in v12 (so only
the last 13 patches, that I will call part 3 of the whole series).

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v11 28/40] builtin/apply: rename option parsing functions

[stefan.naewe]

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/

;-)

> to the apply API.
> 
> Signed-off-by: Christian Couder 
> ---
>  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(>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", , N_("path"),
>   N_("don't apply changes matching the given path"),
> - 0, option_parse_exclude },
> + 0, apply_option_parse_exclude },
>   { OPTION_CALLBACK, 0, "include", , N_("path"),
>   N_("apply changes matching the given path"),
> - 0, option_parse_include },
> + 0, apply_option_parse_include },
>   { OPTION_CALLBACK, 'p', NULL, , N_("num"),
>   N_("remove  leading slashes from traditional diff 
> paths"),
> - 0, option_parse_p },
> + 0, apply_option_parse_p },
>   OPT_BOOL(0, "no-add", _add,
>   N_("ignore additions made by the patch")),
>   OPT_BOOL(0, "stat", ,
> @@ -4793,13 +4793,13 @@ int cmd_apply(int argc, const char **argv, const char 
> *prefix)
>   N_("ensure at least  lines of context 
> match")),
>   { OPTION_CALLBACK, 0, "whitespace", , 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", , NULL,
>   N_("ignore changes in whitespace when finding context"),
> - PARSE_OPT_NOARG, option_parse_space_change },
> + PARSE_OPT_NOARG, apply_option_parse_space_change },
>   { 

[PATCH v11 28/40] builtin/apply: rename option parsing functions

[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
to the apply API.

Signed-off-by: Christian Couder 
---
 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(>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", , N_("path"),
N_("don't apply changes matching the given path"),
-   0, option_parse_exclude },
+   0, apply_option_parse_exclude },
{ OPTION_CALLBACK, 0, "include", , N_("path"),
N_("apply changes matching the given path"),
-   0, option_parse_include },
+   0, apply_option_parse_include },
{ OPTION_CALLBACK, 'p', NULL, , N_("num"),
N_("remove  leading slashes from traditional diff 
paths"),
-   0, option_parse_p },
+   0, apply_option_parse_p },
OPT_BOOL(0, "no-add", _add,
N_("ignore additions made by the patch")),
OPT_BOOL(0, "stat", ,
@@ -4793,13 +4793,13 @@ int cmd_apply(int argc, const char **argv, const char 
*prefix)
N_("ensure at least  lines of context 
match")),
{ OPTION_CALLBACK, 0, "whitespace", , 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", , 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", , NULL,
N_("ignore changes in whitespace when finding context"),
-   PARSE_OPT_NOARG,