summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2013-07-06 15:53:27 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-07 10:24:11 -0700
commit3bdb5b9f1fe964dc9ac4aa29b7b80b1e89ba84dc (patch)
tree3f442b92af7214e81bc9a3165c8ae0b7a1b5df8b /diffcore-pickaxe.c
parent61690bf4a1ad499a673995b92cd8ab51104a431c (diff)
downloadgit-3bdb5b9f1fe964dc9ac4aa29b7b80b1e89ba84dc.tar.gz
diffcore-pickaxe: simplify has_changes and containsrs/pickaxe-simplify
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 <rene.scharfe@lsrfire.ath.cx> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
-rw-r--r--diffcore-pickaxe.c11
1 files changed, 4 insertions, 7 deletions
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,