Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
pickaxe: simplify kwset loop in contains()
author
René Scharfe
<l.s.r@web.de>
Sat, 22 Mar 2014 17:16:00 +0000
(18:16 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 24 Mar 2014 22:13:17 +0000
(15:13 -0700)
Inlining the variable "found" actually makes the code shorter and
easier to read.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-pickaxe.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
542b2aa
)
diff --git
a/diffcore-pickaxe.c
b/diffcore-pickaxe.c
index 70753d058a5411e353832600ccb3206f480e9e14..185f86b2840d3337eac9fb2b17b260ca0c53fbab 100644
(file)
--- 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++;
}
}