From: Rasmus Villemoes <rv@rasmusvillemoes.dk>
To: git@vger.kernel.org
Cc: Rasmus Villemoes <rv@rasmusvillemoes.dk>
Subject: [RFC PATCH 2/5] builtin/grep.c: refactor loop in work_done() slightly
Date: Tue, 12 Feb 2019 23:26:51 +0100 [thread overview]
Message-ID: <20190212222654.7432-3-rv@rasmusvillemoes.dk> (raw)
In-Reply-To: <20190212222654.7432-1-rv@rasmusvillemoes.dk>
As preparation for changing all accesses to the todo array to use a
helper function, do the .done check in the loop body.
Signed-off-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
---
builtin/grep.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 6c1e90d43b..211ae54222 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -137,9 +137,11 @@ static void work_done(struct work_item *w)
grep_lock();
w->done = 1;
old_done = todo_done;
- for(; todo[todo_done].done && todo_done != todo_start;
+ for(; todo_done != todo_start;
todo_done = (todo_done+1) % ARRAY_SIZE(todo)) {
w = &todo[todo_done];
+ if (!w->done)
+ break;
if (w->out.len) {
const char *p = w->out.buf;
size_t len = w->out.len;
--
2.20.1
next prev parent reply other threads:[~2019-02-12 22:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 22:26 [RFC PATCH 0/5] builtin/grep.c: fix a tiny logic flaw Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 1/5] builtin/grep.c: change todo_* variables to unsigned Rasmus Villemoes
2019-02-12 22:26 ` Rasmus Villemoes [this message]
2019-02-12 22:26 ` [RFC PATCH 3/5] builtin/grep.c: add shorthand for &todo[todo_end] in add_work() Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 4/5] builtin/grep.c: add todo_item helper Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 5/5] builtin/grep.c: fix fence-post error in add_work() Rasmus Villemoes
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190212222654.7432-3-rv@rasmusvillemoes.dk \
--to=rv@rasmusvillemoes.dk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).