undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/pickaxe-simplify'

Browse Source 
* rs/pickaxe-simplify:
  diffcore-pickaxe: simplify has_changes and contains
This commit is contained in:
Junio C Hamano 2013-07-12 12:04:17 -07:00
commit d5a3897f94
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diffcore-pickaxe.c
View File

@ -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,