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

diffcore-pickaxe: mark unused parameters in pickaxe functions

Browse Source 
We have a virtual pickaxe_fn for handling -G versus -S pickaxe options.
They need to take the same set of parameters, but of course they care
about different ones (e.g., a regex -G will never use a kwset).

Mark the unused ones to appease -Wunused-parameter.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2022-10-17 21:09:07 -04:00 committed by Junio C Hamano
parent dfd2a23885
commit 0ada4b9bfe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diffcore-pickaxe.c
View File

@ -38,7 +38,7 @@ static int diffgrep_consume(void *priv, char *line, unsigned long len)
static int diff_grep(mmfile_t *one, mmfile_t *two, static int diff_grep(mmfile_t *one, mmfile_t *two,
struct diff_options *o, struct diff_options *o,
regex_t *regexp, kwset_t kws) regex_t *regexp, kwset_t kws UNUSED)
{ {
struct diffgrep_cb ecbdata; struct diffgrep_cb ecbdata;
xpparam_t xpp; xpparam_t xpp;
@ -114,7 +114,7 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws,
} }
static int has_changes(mmfile_t *one, mmfile_t *two, static int has_changes(mmfile_t *one, mmfile_t *two,
struct diff_options *o, struct diff_options *o UNUSED,
regex_t *regexp, kwset_t kws) regex_t *regexp, kwset_t kws)
{ {
unsigned int c1 = one ? contains(one, regexp, kws, 0) : 0; unsigned int c1 = one ? contains(one, regexp, kws, 0) : 0;