mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 02:04:08 +01:00
Code

builtin/apply: move 'p_value_known' global into 'struct apply_state'

Browse Source 
To libify the apply functionality the 'p_value_known' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-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-05-24 10:11:10 +02:00 committed by Junio C Hamano
parent dbd23433e7
commit b76184e410
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/apply.c
View File

@ -52,6 +52,7 @@ struct apply_state {
const char *patch_input_file; const char *patch_input_file;
int line_termination; int line_termination;
int p_value; int p_value;
int p_value_known;
unsigned int p_context; unsigned int p_context;
/* Exclude and include path parameters */ /* Exclude and include path parameters */
@ -61,8 +62,6 @@ struct apply_state {
static int newfd = -1; static int newfd = -1;
static int p_value_known;
static const char * const apply_usage[] = { static const char * const apply_usage[] = {
N_("git apply [<options>] [<patch>...]"), N_("git apply [<options>] [<patch>...]"),
NULL NULL
@ -875,14 +874,14 @@ static void parse_traditional_patch(struct apply_state *state,
first += 4; /* skip "--- " */ first += 4; /* skip "--- " */
second += 4; /* skip "+++ " */ second += 4; /* skip "+++ " */
if (!p_value_known) { if (!state->p_value_known) {
int p, q; int p, q;
p = guess_p_value(state, first); p = guess_p_value(state, first);
q = guess_p_value(state, second); q = guess_p_value(state, second);
if (p < 0) p = q; if (p < 0) p = q;
if (0 <= p && p == q) { if (0 <= p && p == q) {
state->p_value = p; state->p_value = p;
p_value_known = 1; state->p_value_known = 1;
} }
} }
if (is_dev_null(first)) { if (is_dev_null(first)) {
@ -4588,7 +4587,7 @@ static int option_parse_p(const struct option *opt,
{ {
struct apply_state *state = opt->value; struct apply_state *state = opt->value;
state->p_value = atoi(arg); state->p_value = atoi(arg);
p_value_known = 1; state->p_value_known = 1;
return 0; return 0;
} }