apply: make some parsing functions static again

chriscool · gitster · commit 9123d5ddfe1c · 2016-09-07T12:29:53.000-07:00
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 &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/apply.c b/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") ||
diff --git a/apply.h b/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,

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static void git_apply_config(void)`
`27`	`27`	`git_config(git_default_config, NULL);`
`28`	`28`	`}`
`29`	`29`
`30`		`-int parse_whitespace_option(struct apply_state state, const char option)`
	`30`	`+static int parse_whitespace_option(struct apply_state state, const char option)`
`31`	`31`	`{`
`32`	`32`	`if (!option) {`
`33`	`33`	`state->ws_error_action = warn_on_ws_error;`
`@@ -57,8 +57,8 @@ int parse_whitespace_option(struct apply_state state, const char option)`
`57`	`57`	`return error(_("unrecognized whitespace option '%s'"), option);`
`58`	`58`	`}`
`59`	`59`
`60`		`-int parse_ignorewhitespace_option(struct apply_state *state,`
`61`		`- const char *option)`
	`60`	`+static int parse_ignorewhitespace_option(struct apply_state *state,`
	`61`	`+ const char *option)`
`62`	`62`	`{`
`63`	`63`	`if (!option \|\| !strcmp(option, "no") \|\|`
`64`	`64`	`!strcmp(option, "false") \|\| !strcmp(option, "never") \|\|`