From: "René Scharfe" <l.s.r@web•de>
To: Git Mailing List <git@vger•kernel.org>
Cc: Junio C Hamano <gitster@pobox•com>, David Kastrup <dak@gnu•org>
Subject: [PATCH 1/2] blame: factor out get_next_line()
Date: Fri, 13 Jun 2014 21:53:03 +0200 [thread overview]
Message-ID: <539B569F.1090800@web.de> (raw)
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>
---
builtin/blame.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index a52a279..ad37edc 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2008,6 +2008,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.
@@ -2021,15 +2027,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 */
@@ -2038,15 +2037,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;
--
2.0.0
next reply other threads:[~2014-06-13 19:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-13 19:53 René Scharfe [this message]
2014-06-13 19:54 ` [PATCH 2/2] blame: simplify prepare_lines() René Scharfe
2014-06-13 21:13 ` Jonathan Nieder
2014-06-13 21:33 ` René Scharfe
2014-06-13 21:46 ` Jonathan Nieder
2014-06-13 21:05 ` [PATCH 1/2] blame: factor out get_next_line() Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=539B569F.1090800@web.de \
--to=l.s.r@web$(echo .)de \
--cc=dak@gnu$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox