Browse Source

pickaxe: simplify kwset loop in contains()

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>
maint
René Scharfe 11 years ago committed by Junio C Hamano
parent
commit
e4aab50475
  1. 7
      diffcore-pickaxe.c

7
diffcore-pickaxe.c

@ -94,13 +94,10 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws) @@ -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++;
}
}

Loading…
Cancel
Save