From: René Scharfe Date: Sat, 6 Jul 2013 13:53:27 +0000 (+0200) Subject: diffcore-pickaxe: simplify has_changes and contains X-Git-Tag: v1.8.4-rc0~62^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bdb5b9f1fe964dc9ac4aa29b7b80b1e89ba84dc;p=thirdparty%2Fgit.git diffcore-pickaxe: simplify has_changes and contains Halve the number of callsites of contains() to two using temporary variables, simplifying the code. While at it, get rid of the diff_options parameter, which became unused with 8fa4b09f. Signed-off-by: René Scharfe Acked-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 63722f86dc..0846fa7461 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -131,8 +131,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o) return; } -static unsigned int contains(mmfile_t *mf, struct diff_options *o, - regex_t *regexp, kwset_t kws) +static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws) { unsigned int cnt; unsigned long sz; @@ -176,11 +175,9 @@ static int has_changes(mmfile_t *one, mmfile_t *two, struct diff_options *o, regex_t *regexp, kwset_t kws) { - if (!one) - return contains(two, o, regexp, kws) != 0; - if (!two) - return contains(one, o, regexp, kws) != 0; - return contains(one, o, regexp, kws) != contains(two, o, regexp, kws); + unsigned int one_contains = one ? contains(one, regexp, kws) : 0; + unsigned int two_contains = two ? contains(two, regexp, kws) : 0; + return one_contains != two_contains; } static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,