From: Christian Couder Date: Sun, 24 Apr 2016 13:33:48 GMT Subject: [PATCH 48/83] builtin/apply: rename 'prefix_' parameter to 'prefix' Message-ID: <1461504863-15946-49-git-send-email-chriscool@tuxfamily.org> In-Reply-To: <1461504863-15946-1-git-send-email-chriscool@tuxfamily.org> Signed-off-by: Christian Couder --- builtin/apply.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 787426f..6c0b153 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4670,10 +4670,10 @@ static int option_parse_directory(const struct option *opt, return 0; } -static void init_apply_state(struct apply_state *state, const char *prefix_) +static void init_apply_state(struct apply_state *state, const char *prefix) { memset(state, 0, sizeof(*state)); - state->prefix = prefix_; + state->prefix = prefix; state->prefix_length = state->prefix ? strlen(state->prefix) : 0; state->apply = 1; state->line_termination = '\n'; @@ -4789,7 +4789,7 @@ static int apply_all_patches(struct apply_state *state, return !!errs; } -int cmd_apply(int argc, const char **argv, const char *prefix_) +int cmd_apply(int argc, const char **argv, const char *prefix) { int force_apply = 0; int options = 0; @@ -4864,7 +4864,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) OPT_END() }; - init_apply_state(&state, prefix_); + init_apply_state(&state, prefix); argc = parse_options(argc, argv, state.prefix, builtin_apply_options, apply_usage, 0); -- 2.8.1.300.g5fed0c0