pickaxe: give diff_grep the same signature as has_changes

René Scharfe · gitster · commit db99cb700098 · 2011-10-07T15:46:14.000-07:00
Change diff_grep() to match the signature of has_changes() as a
preparation for the next patch that will use function pointers to
the two.

Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
@@ -45,7 +45,8 @@ static void fill_one(struct diff_filespec *one,
 	}
 }
 
-static int diff_grep(struct diff_filepair *p, regex_t *regexp, struct diff_options *o)
+static int diff_grep(struct diff_filepair *p, struct diff_options *o,
+		     regex_t *regexp, kwset_t kws)
 {
 	regmatch_t regmatch;
 	struct userdiff_driver *textconv_one = NULL;
@@ -114,7 +115,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
 		/* Showing the whole changeset if needle exists */
 		for (i = 0; i < q->nr; i++) {
 			struct diff_filepair *p = q->queue[i];
-			if (diff_grep(p, &regex, o))
+			if (diff_grep(p, o, &regex, NULL))
 				goto out; /* do not munge the queue */
 		}
 
@@ -129,7 +130,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
 		/* Showing only the filepairs that has the needle */
 		for (i = 0; i < q->nr; i++) {
 			struct diff_filepair *p = q->queue[i];
-			if (diff_grep(p, &regex, o))
+			if (diff_grep(p, o, &regex, NULL))
 				diff_q(&outq, p);
 			else
 				diff_free_filepair(p);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ static void fill_one(struct diff_filespec *one,`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-static int diff_grep(struct diff_filepair p, regex_t regexp, struct diff_options *o)`
	`48`	`+static int diff_grep(struct diff_filepair p, struct diff_options o,`
	`49`	`+ regex_t *regexp, kwset_t kws)`
`49`	`50`	`{`
`50`	`51`	`regmatch_t regmatch;`
`51`	`52`	`struct userdiff_driver *textconv_one = NULL;`
`@@ -114,7 +115,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)`
`114`	`115`	`/* Showing the whole changeset if needle exists */`
`115`	`116`	`for (i = 0; i < q->nr; i++) {`
`116`	`117`	`struct diff_filepair *p = q->queue[i];`
`117`		`- if (diff_grep(p, &regex, o))`
	`118`	`+ if (diff_grep(p, o, &regex, NULL))`
`118`	`119`	`goto out; /* do not munge the queue */`
`119`	`120`	`}`
`120`	`121`
`@@ -129,7 +130,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o)`
`129`	`130`	`/* Showing only the filepairs that has the needle */`
`130`	`131`	`for (i = 0; i < q->nr; i++) {`
`131`	`132`	`struct diff_filepair *p = q->queue[i];`
`132`		`- if (diff_grep(p, &regex, o))`
	`133`	`+ if (diff_grep(p, o, &regex, NULL))`
`133`	`134`	`diff_q(&outq, p);`
`134`	`135`	`else`
`135`	`136`	`diff_free_filepair(p);`