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

[PATCH v13 01/14] builtin/apply: rename option parsing functions

From
Christian Couder <christian.couder@gmail.com>
Date
Aug 27, 2016, 18:45 UTC
Message-ID
<20160827184547.4365-2-chriscool@tuxfamily.org>
In-Reply-To
<20160827184547.4365-1-chriscool@tuxfamily.org>

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 <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()
 	};
 

-- 
2.9.2.770.g14ff7d2
Previous: Christian CouderNext: Christian Couder
Message 7 of 38 in “libify apply and use lib in am, part 3”
  1. 00/14 libify apply and use lib in am, part 3Christian Couder, Aug 27, 2016
  2. 04/14 apply: make some parsing functions static againChristian Couder, Aug 27, 2016
  3. Stefan BellerAug 31, 2016
  4. 02/14 apply: rename and move opt constants to apply.hChristian Couder, Aug 27, 2016
  5. Stefan BellerAug 31, 2016
  6. Christian CouderSep 1, 2016
  7. 01/14 builtin/apply: rename option parsing functionsChristian Couder, Aug 27, 2016
  8. 05/14 apply: use error_errno() where possibleChristian Couder, Aug 27, 2016
  9. Stefan BellerAug 31, 2016
  10. 07/14 apply: don't print on stdout in verbosity_silent modeChristian Couder, Aug 27, 2016
  11. 06/14 apply: make it possible to silently applyChristian Couder, Aug 27, 2016
  12. Stefan BellerAug 31, 2016
  13. Christian CouderSep 1, 2016
  14. Stefan BellerSep 1, 2016
  15. 08/14 usage: add set_warn_routine()Christian Couder, Aug 27, 2016
  16. 14/14 builtin/am: use apply API in run_apply()Christian Couder, Aug 27, 2016
  17. Stefan BellerAug 31, 2016
  18. Christian CouderSep 1, 2016
  19. 13/14 apply: learn to use a different index fileChristian Couder, Aug 27, 2016
  20. 11/14 apply: refactor `git apply` option parsingChristian Couder, Aug 27, 2016
  21. 10/14 apply: change error_routine when silentChristian Couder, Aug 27, 2016
  22. Stefan BellerAug 31, 2016
  23. Christian CouderSep 1, 2016
  24. Christian CouderSep 4, 2016
  25. Ramsay JonesSep 4, 2016
  26. Christian CouderSep 4, 2016
  27. 09/14 usage: add get_error_routine() and get_warn_routine()Christian Couder, Aug 27, 2016
  28. 12/14 apply: pass apply state to build_fake_ancestor()Christian Couder, Aug 27, 2016
  29. Christian CouderAug 27, 2016
  30. Junio C HamanoAug 29, 2016
  31. Junio C HamanoAug 29, 2016
  32. Christian CouderAug 30, 2016
  33. Junio C HamanoAug 31, 2016
  34. Christian CouderSep 1, 2016
  35. Junio C HamanoSep 1, 2016
  36. Christian CouderSep 4, 2016
  37. Stefan BellerAug 31, 2016
  38. Christian CouderSep 1, 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.