undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: rename and move opt constants to apply.h

Browse Source 
The constants for the "inaccurate-eof" and the "recount" options will
be used in both "apply.c" and "builtin/apply.c", so they need to go
into "apply.h", and therefore they need a name that is more specific
to the API they belong to.

Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-09-04 22:18:21 +02:00 committed by Junio C Hamano
parent da8e30dcd9
commit 803bf4e012
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apply.h
View File

@ -108,4 +108,11 @@ extern int init_apply_state(struct apply_state *state,
extern void clear_apply_state(struct apply_state *state); extern void clear_apply_state(struct apply_state *state);
extern int check_apply_state(struct apply_state *state, int force_apply); extern int check_apply_state(struct apply_state *state, int force_apply);
/*
* Some aspects of the apply behavior are controlled by the following
* bits in the "options" parameter passed to apply_all_patches().
*/
#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */
#endif #endif

11
builtin/apply.c
View File

@ -4463,9 +4463,6 @@ static int write_out_results(struct apply_state *state, struct patch *list)
static struct lock_file lock_file; static struct lock_file lock_file;
#define INACCURATE_EOF (1<<0)
#define RECOUNT (1<<1)
/* /*
* Try to apply a patch. * Try to apply a patch.
* *
@ -4495,8 +4492,8 @@ static int apply_patch(struct apply_state *state,
int nr; int nr;
patch = xcalloc(1, sizeof(*patch)); patch = xcalloc(1, sizeof(*patch));
patch->inaccurate_eof = !!(options & INACCURATE_EOF); patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);
patch->recount = !!(options & RECOUNT); patch->recount = !!(options & APPLY_OPT_RECOUNT);
nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch); nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
if (nr < 0) { if (nr < 0) {
free_patch(patch); free_patch(patch);
@ -4811,10 +4808,10 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
OPT__VERBOSE(&state.apply_verbosely, N_("be verbose")), OPT__VERBOSE(&state.apply_verbosely, N_("be verbose")),
OPT_BIT(0, "inaccurate-eof", &options, OPT_BIT(0, "inaccurate-eof", &options,
N_("tolerate incorrectly detected missing new-line at the end of file"), N_("tolerate incorrectly detected missing new-line at the end of file"),
INACCURATE_EOF), APPLY_OPT_INACCURATE_EOF),
OPT_BIT(0, "recount", &options, OPT_BIT(0, "recount", &options,
N_("do not trust the line counts in the hunk headers"), N_("do not trust the line counts in the hunk headers"),
RECOUNT), APPLY_OPT_RECOUNT),
{ OPTION_CALLBACK, 0, "directory", &state, N_("root"), { OPTION_CALLBACK, 0, "directory", &state, N_("root"),
N_("prepend <root> to all filenames"), N_("prepend <root> to all filenames"),
0, apply_option_parse_directory }, 0, apply_option_parse_directory },