mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
blame: factor out get_next_line()
Move the code for finding the start of the next line into a helper function in order to reduce duplication. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e156455ea4
commit
29aa0b2061
|
@ -1741,6 +1741,12 @@ static void output(struct scoreboard *sb, int option)
|
|||
}
|
||||
}
|
||||
|
||||
static const char *get_next_line(const char *start, const char *end)
|
||||
{
|
||||
const char *nl = memchr(start, '\n', end - start);
|
||||
return nl ? nl + 1 : NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* To allow quick access to the contents of nth line in the
|
||||
* final image, prepare an index in the scoreboard.
|
||||
|
@ -1754,15 +1760,8 @@ static int prepare_lines(struct scoreboard *sb)
|
|||
int *lineno;
|
||||
int num = 0, incomplete = 0;
|
||||
|
||||
for (p = buf;;) {
|
||||
p = memchr(p, '\n', end - p);
|
||||
if (p) {
|
||||
p++;
|
||||
num++;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
for (p = get_next_line(buf, end); p; p = get_next_line(p, end))
|
||||
num++;
|
||||
|
||||
if (len && end[-1] != '\n')
|
||||
incomplete++; /* incomplete line at the end */
|
||||
|
@ -1771,15 +1770,8 @@ static int prepare_lines(struct scoreboard *sb)
|
|||
lineno = sb->lineno;
|
||||
|
||||
*lineno++ = 0;
|
||||
for (p = buf;;) {
|
||||
p = memchr(p, '\n', end - p);
|
||||
if (p) {
|
||||
p++;
|
||||
*lineno++ = p - buf;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
for (p = get_next_line(buf, end); p; p = get_next_line(p, end))
|
||||
*lineno++ = p - buf;
|
||||
|
||||
if (incomplete)
|
||||
*lineno++ = len;
|
||||
|
|
Loading…
Reference in a new issue