mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: mark unused parameters in callbacks

Browse Source 
The diff code provides a format_callback interface, but not every
callback needs each parameter (e.g., the "opt" and "data" parameters are
frequently left unused). Likewise for the output_prefix callback, the
low-level change/add_remove interfaces, the callbacks used by
xdi_diff(), etc.

Mark unused arguments in the callback implementations to quiet
-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-12-13 06:13:48 -05:00
committed by Junio C Hamano
parent 8157ed4046
commit 61bdc7c5d8
15 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
revision.c
View File

@ -600,10 +600,12 @@ static struct commit *one_relevant_parent(const struct rev_info *revs,
static int tree_difference = REV_TREE_SAME;
static void file_add_remove(struct diff_options *options,
int addremove, unsigned mode,
const struct object_id *oid,
int oid_valid,
const char *fullpath, unsigned dirty_submodule)
int addremove,
unsigned mode UNUSED,
const struct object_id *oid UNUSED,
int oid_valid UNUSED,
const char *fullpath UNUSED,
unsigned dirty_submodule UNUSED)
{
int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
struct rev_info *revs = options->change_fn_data;
@ -614,12 +616,15 @@ static void file_add_remove(struct diff_options *options,
}
static void file_change(struct diff_options *options,
unsigned old_mode, unsigned new_mode,
const struct object_id *old_oid,
const struct object_id *new_oid,
int old_oid_valid, int new_oid_valid,
const char *fullpath,
unsigned old_dirty_submodule, unsigned new_dirty_submodule)
unsigned old_mode UNUSED,
unsigned new_mode UNUSED,
const struct object_id *old_oid UNUSED,
const struct object_id *new_oid UNUSED,
int old_oid_valid UNUSED,
int new_oid_valid UNUSED,
const char *fullpath UNUSED,
unsigned old_dirty_submodule UNUSED,
unsigned new_dirty_submodule UNUSED)
{
tree_difference = REV_TREE_DIFFERENT;
options->flags.has_changes = 1;