kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe() 

diffcore_pickaxe_count() initializes the regular expression or kwset for
the search term, calls pickaxe() with the callback has_changes() and
cleans up afterwards.  diffcore_pickaxe_grep() does the same, only it
doesn't support kwset and uses the callback diff_grep() instead.  Merge
the two functions to form the new diffcore_pickaxe() and thus get rid of
the duplicate regex setup and cleanup code.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2014-03-22 18:15:57 +01:00 committed by Junio C Hamano
parent 218c45a45c
commit 63b52afaa8
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
diffcore-pickaxe.c
View File

@ -108,29 +108,6 @@ static int diff_grep(mmfile_t *one, mmfile_t *two,
return ecbdata.hit;
}

static void diffcore_pickaxe_grep(struct diff_options *o)
{
int err;
regex_t regex;
int cflags = REG_EXTENDED | REG_NEWLINE;

if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
cflags |= REG_ICASE;

err = regcomp(&regex, o->pickaxe, cflags);
if (err) {
char errbuf[1024];
regerror(err, &regex, errbuf, 1024);
regfree(&regex);
die("invalid regex: %s", errbuf);
}

pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);

regfree(&regex);
return;
}

static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
{
unsigned int cnt;
@ -227,7 +204,7 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
return ret;
}

static void diffcore_pickaxe_count(struct diff_options *o)
void diffcore_pickaxe(struct diff_options *o)
{
const char *needle = o->pickaxe;
int opts = o->pickaxe_opts;
@ -235,7 +212,7 @@ static void diffcore_pickaxe_count(struct diff_options *o)
regex_t regex, *regexp = NULL;
kwset_t kws = NULL;

if (opts & DIFF_PICKAXE_REGEX) {
if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
int err;
int cflags = REG_EXTENDED | REG_NEWLINE;
if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
@ -256,20 +233,13 @@ static void diffcore_pickaxe_count(struct diff_options *o)
kwsprep(kws);
}

pickaxe(&diff_queued_diff, o, regexp, kws, has_changes);
/* Might want to warn when both S and G are on; I don't care... */
pickaxe(&diff_queued_diff, o, regexp, kws,
(opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);

if (opts & DIFF_PICKAXE_REGEX)
regfree(&regex);
if (regexp)
regfree(regexp);
else
kwsfree(kws);
return;
}

void diffcore_pickaxe(struct diff_options *o)
{
/* Might want to warn when both S and G are on; I don't care... */
if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
diffcore_pickaxe_grep(o);
else
diffcore_pickaxe_count(o);
}