mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -p: use ALLOC_GROW_BY instead of ALLOW_GROW

Browse Source 
This simplifies the code slightly, especially the third case where
hunk_nr was incremented a few lines before ALLOC_GROW().

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2020-08-17 13:23:07 +00:00
committed by Junio C Hamano
parent 47ae905ffb
commit 2ebe436c55
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
add-patch.c
View File

@ -457,11 +457,9 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
eol = pend; eol = pend;
if (starts_with(p, "diff ")) { if (starts_with(p, "diff ")) {
s->file_diff_nr++; ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
ALLOC_GROW(s->file_diff, s->file_diff_nr,
file_diff_alloc); file_diff_alloc);
file_diff = s->file_diff + s->file_diff_nr - 1; file_diff = s->file_diff + s->file_diff_nr - 1;
memset(file_diff, 0, sizeof(*file_diff));
hunk = &file_diff->head; hunk = &file_diff->head;
hunk->start = p - plain->buf; hunk->start = p - plain->buf;
if (colored_p) if (colored_p)
@ -483,11 +481,9 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
*/ */
hunk->splittable_into++; hunk->splittable_into++;
file_diff->hunk_nr++; ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr,
file_diff->hunk_alloc); file_diff->hunk_alloc);
hunk = file_diff->hunk + file_diff->hunk_nr - 1; hunk = file_diff->hunk + file_diff->hunk_nr - 1;
memset(hunk, 0, sizeof(*hunk));
hunk->start = p - plain->buf; hunk->start = p - plain->buf;
if (colored) if (colored)
@ -511,7 +507,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
if (file_diff->mode_change) if (file_diff->mode_change)
BUG("double mode change?\n\n%.*s", BUG("double mode change?\n\n%.*s",
(int)(eol - plain->buf), plain->buf); (int)(eol - plain->buf), plain->buf);
if (file_diff->hunk_nr++) if (file_diff->hunk_nr)
BUG("mode change in the middle?\n\n%.*s", BUG("mode change in the middle?\n\n%.*s",
(int)(eol - plain->buf), plain->buf); (int)(eol - plain->buf), plain->buf);
@ -520,9 +516,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
* is _part of_ the header "hunk". * is _part of_ the header "hunk".
*/ */
file_diff->mode_change = 1; file_diff->mode_change = 1;
ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
file_diff->hunk_alloc); file_diff->hunk_alloc);
memset(file_diff->hunk, 0, sizeof(struct hunk));
file_diff->hunk->start = p - plain->buf; file_diff->hunk->start = p - plain->buf;
if (colored_p) if (colored_p)
file_diff->hunk->colored_start = file_diff->hunk->colored_start =