summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 12:04:17 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 12:04:17 -0700
commitd5a3897f94dc4a2a77f30eeaf39cf14468061d0d (patch)
treec4a6486ec65d5f9426d5d76946518079e2b3e466 /diffcore-pickaxe.c
parent533a05f63ac110c17d4b3d6f6472b504a9ec8f92 (diff)
parent3bdb5b9f1fe964dc9ac4aa29b7b80b1e89ba84dc (diff)
downloadgit-d5a3897f94dc4a2a77f30eeaf39cf14468061d0d.tar.gz
Merge branch 'rs/pickaxe-simplify'
* rs/pickaxe-simplify: diffcore-pickaxe: simplify has_changes and contains
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 c97ac9b463..401eb72c61 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,