From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Karsten Blees" <karsten.blees@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v9 28/41] builtin/apply: rename option parsing functions
Date: Sat, 30 Jul 2016 19:24:56 +0200 [thread overview]
Message-ID: <20160730172509.22939-29-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160730172509.22939-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 7165abd..c7e570a 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4585,16 +4585,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);
@@ -4602,9 +4602,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);
@@ -4612,8 +4612,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)
@@ -4623,8 +4623,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;
@@ -4633,8 +4633,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);
@@ -4752,13 +4752,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,
@@ -4790,13 +4790,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,
@@ -4814,7 +4814,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.558.gf53e569
next prev parent reply other threads:[~2016-07-30 17:27 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-30 17:24 [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-07-30 17:24 ` [PATCH v9 01/41] apply: make some names more specific Christian Couder
2016-07-30 17:24 ` [PATCH v9 02/41] apply: move 'struct apply_state' to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing Christian Couder
2016-08-01 16:16 ` Stefan Beller
2016-07-30 17:24 ` [PATCH v9 04/41] builtin/apply: read_patch_file() return -1 " Christian Couder
2016-08-01 16:24 ` Stefan Beller
2016-07-30 17:24 ` [PATCH v9 05/41] builtin/apply: make find_header() return -128 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 06/41] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 07/41] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 08/41] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 09/41] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 10/41] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 11/41] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 12/41] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 13/41] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 14/41] builtin/apply: make apply_all_patches() return 128 or 1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 15/41] builtin/apply: make parse_traditional_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 16/41] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-07-30 17:24 ` [PATCH v9 17/41] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-07-30 17:24 ` [PATCH v9 19/41] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 20/41] builtin/apply: make remove_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 21/41] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 22/41] builtin/apply: make add_index_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 23/41] builtin/apply: make create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 24/41] builtin/apply: make write_out_one_result() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 25/41] builtin/apply: make write_out_results() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 26/41] builtin/apply: make try_create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 27/41] builtin/apply: make create_one_file() " Christian Couder
2016-07-30 17:24 ` Christian Couder [this message]
2016-07-30 17:24 ` [PATCH v9 29/41] apply: rename and move opt constants to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 31/41] apply: make some parsing functions static again Christian Couder
2016-07-30 17:25 ` [PATCH v9 32/41] apply: use error_errno() where possible Christian Couder
2016-07-30 17:25 ` [PATCH v9 33/41] environment: add set_index_file() Christian Couder
2016-08-01 17:24 ` Stefan Beller
2016-08-01 20:37 ` Junio C Hamano
2016-08-01 20:40 ` Junio C Hamano
2016-08-03 6:57 ` Christian Couder
2016-08-03 6:41 ` Christian Couder
2016-07-30 17:25 ` [PATCH v9 34/41] write_or_die: use warning() instead of fprintf(stderr, ...) Christian Couder
2016-07-30 17:25 ` [PATCH v9 35/41] apply: make it possible to silently apply Christian Couder
2016-08-01 22:05 ` Junio C Hamano
2016-07-30 17:25 ` [PATCH v9 36/41] apply: don't print on stdout in verbosity_silent mode Christian Couder
2016-07-30 17:25 ` [PATCH v9 37/41] usage: add set_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 38/41] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 39/41] apply: change error_routine when silent Christian Couder
2016-08-01 16:58 ` Stefan Beller
2016-08-08 11:31 ` Christian Couder
2016-07-30 17:25 ` [PATCH v9 40/41] apply: refactor `git apply` option parsing Christian Couder
2016-07-30 17:25 ` [PATCH v9 41/41] builtin/am: use apply api in run_apply() Christian Couder
2016-07-30 19:50 ` [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-08-01 22:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160730172509.22939-29-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=karsten.blees@gmail.com \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).