summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2019-07-08 16:33:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-09 18:29:02 (GMT)
commit570fe9911b6eb5c64f22a54eb3a7590b7ba5f854 (patch)
treefd89080e78686d542a828848b68e26611d7e9d20 /apply.c
parent85c3713df5a48bbc7807fe9710fe8a22e65ea76b (diff)
downloadgit-570fe9911b6eb5c64f22a54eb3a7590b7ba5f854.zip
git-570fe9911b6eb5c64f22a54eb3a7590b7ba5f854.tar.gz
git-570fe9911b6eb5c64f22a54eb3a7590b7ba5f854.tar.bz2
apply: only pass required data to check_header_line
Currently the 'check_header_line()' function takes 'struct apply_state' as parameter, even though it only needs the linenr from that struct. This function is in the callchain of 'parse_git_header()', which we want to make more generally useful in a subsequent commit. To make that happen we only want to pass in the required data to 'parse_git_header()', and not the whole 'struct apply_state', and thus we want functions in the callchain of 'parse_git_header()' to only take arguments they really need. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apply.c b/apply.c
index 97f8fe2..36e2b25 100644
--- a/apply.c
+++ b/apply.c
@@ -1302,15 +1302,15 @@ static char *git_header_name(int p_value,
}
}
-static int check_header_line(struct apply_state *state, struct patch *patch)
+static int check_header_line(int linenr, struct patch *patch)
{
int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +
(patch->is_rename == 1) + (patch->is_copy == 1);
if (extensions > 1)
return error(_("inconsistent header lines %d and %d"),
- patch->extension_linenr, state->linenr);
+ patch->extension_linenr, linenr);
if (extensions && !patch->extension_linenr)
- patch->extension_linenr = state->linenr;
+ patch->extension_linenr = linenr;
return 0;
}
@@ -1380,7 +1380,7 @@ static int parse_git_header(struct apply_state *state,
res = p->fn(state, line + oplen, patch);
if (res < 0)
return -1;
- if (check_header_line(state, patch))
+ if (check_header_line(state->linenr, patch))
return -1;
if (res > 0)
return offset;