From: "René Scharfe" <l.s.r@web.de>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 10/10] pickaxe: simplify kwset loop in contains()
Date: Sat, 22 Mar 2014 18:16:00 +0100 [thread overview]
Message-ID: <1395508560-19893-11-git-send-email-l.s.r@web.de> (raw)
In-Reply-To: <1395508560-19893-1-git-send-email-l.s.r@web.de>
Inlining the variable "found" actually makes the code shorter and
easier to read.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
diffcore-pickaxe.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 70753d0..185f86b 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -94,13 +94,10 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
while (sz) {
struct kwsmatch kwsm;
size_t offset = kwsexec(kws, data, sz, &kwsm);
- const char *found;
if (offset == -1)
break;
- else
- found = data + offset;
- sz -= found - data + kwsm.size[0];
- data = found + kwsm.size[0];
+ sz -= offset + kwsm.size[0];
+ data += offset + kwsm.size[0];
cnt++;
}
}
--
1.9.1
next prev parent reply other threads:[~2014-03-22 17:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-22 17:15 [PATCH 00/10] pickaxe: honor -i when used with -S and --pickaxe-regex; cleanups René Scharfe
2014-03-22 17:15 ` [PATCH 01/10] t4209: set up expectations up front René Scharfe
2014-03-22 17:15 ` [PATCH 02/10] t4209: factor out helper function test_log() René Scharfe
2014-03-22 17:15 ` [PATCH 03/10] t4209: factor out helper function test_log_icase() René Scharfe
2014-03-24 18:22 ` Junio C Hamano
2014-03-24 21:10 ` Jeff King
2014-03-24 21:45 ` René Scharfe
2014-03-24 22:09 ` Junio C Hamano
2014-03-22 17:15 ` [PATCH 04/10] t4209: use helper functions to test --grep René Scharfe
2014-03-24 18:22 ` Junio C Hamano
2014-03-24 21:14 ` Jeff King
2014-03-24 21:42 ` René Scharfe
2014-03-22 17:15 ` [PATCH 05/10] t4209: use helper functions to test --author René Scharfe
2014-03-22 17:15 ` [PATCH 06/10] pickaxe: honor -i when used with -S and --pickaxe-regex René Scharfe
2014-03-22 17:15 ` [PATCH 07/10] pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe() René Scharfe
2014-03-22 17:15 ` [PATCH 08/10] pickaxe: move pickaxe() after pickaxe_match() René Scharfe
2014-03-24 21:21 ` Jeff King
2014-03-22 17:15 ` [PATCH 09/10] pickaxe: call strlen only when necessary in diffcore_pickaxe_count() René Scharfe
2014-03-22 17:16 ` René Scharfe [this message]
2014-03-24 18:19 ` [PATCH 00/10] pickaxe: honor -i when used with -S and --pickaxe-regex; cleanups Junio C Hamano
2014-03-24 21:22 ` Jeff King
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=1395508560-19893-11-git-send-email-l.s.r@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).