git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v12 04/13] apply: make some parsing functions static again

From
Christian Couder <christian.couder@gmail.com>
Date
Aug 11, 2016, 18:44 UTC
Message-ID
<20160811184501.384-5-chriscool@tuxfamily.org>
In-Reply-To
<20160811184501.384-1-chriscool@tuxfamily.org>

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>
---
 apply.c | 6 +++---
 apply.h | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/apply.c b/apply.c
index 7b96130..c0cb3f5 100644
--- 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
index 5ec022c..df44b51 100644
--- 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,
-- 
2.9.2.769.gc0f0333
Previous: Christian CouderNext: Christian Couder
Message 4 of 15 in “libify apply and use lib in am, part 3”
  1. 00/13 libify apply and use lib in am, part 3Christian Couder, Aug 11, 2016
  2. 01/13 builtin/apply: rename option parsing functionsChristian Couder, Aug 11, 2016
  3. 02/13 apply: rename and move opt constants to apply.hChristian Couder, Aug 11, 2016
  4. 04/13 apply: make some parsing functions static againChristian Couder, Aug 11, 2016
  5. 06/13 apply: make it possible to silently applyChristian Couder, Aug 11, 2016
  6. 05/13 apply: use error_errno() where possibleChristian Couder, Aug 11, 2016
  7. 07/13 apply: don't print on stdout in verbosity_silent modeChristian Couder, Aug 11, 2016
  8. 09/13 usage: add get_error_routine() and get_warn_routine()Christian Couder, Aug 11, 2016
  9. 11/13 apply: refactor `git apply` option parsingChristian Couder, Aug 11, 2016
  10. 08/13 usage: add set_warn_routine()Christian Couder, Aug 11, 2016
  11. 10/13 apply: change error_routine when silentChristian Couder, Aug 11, 2016
  12. 13/13 builtin/am: use apply API in run_apply()Christian Couder, Aug 11, 2016
  13. 12/13 apply: learn to use a different index fileChristian Couder, Aug 11, 2016
  14. Junio C HamanoAug 11, 2016
  15. Christian CouderAug 26, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.