diff: mark unused parameters in callbacks

peff · gitster · commit 61bdc7c5d8b1 · 2022-12-13T22:16:23.000+09:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/add-interactive.c b/add-interactive.c
@@ -724,7 +724,7 @@ static int run_update(struct add_i_state *s, const struct pathspec *ps,
 }
 
 static void revert_from_diff(struct diff_queue_struct *q,
-			     struct diff_options *opt, void *data)
+			     struct diff_options *opt, void *data UNUSED)
 {
 	int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
 
diff --git a/builtin/add.c b/builtin/add.c
@@ -88,7 +88,7 @@ static int fix_unmerged_status(struct diff_filepair *p,
 }
 
 static void update_callback(struct diff_queue_struct *q,
-			    struct diff_options *opt, void *cbdata)
+			    struct diff_options *opt UNUSED, void *cbdata)
 {
 	int i;
 	struct update_callback_data *data = cbdata;
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
@@ -409,7 +409,7 @@ static const char *anonymize_oid(const char *oid_hex)
 }
 
 static void show_filemodify(struct diff_queue_struct *q,
-			    struct diff_options *options, void *data)
+			    struct diff_options *options UNUSED, void *data)
 {
 	int i;
 	struct string_list *changed = data;
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
@@ -98,7 +98,7 @@ static void *origin(struct merge_list *entry, unsigned long *size)
 	return NULL;
 }
 
-static int show_outf(void *priv_, mmbuffer_t *mb, int nbuf)
+static int show_outf(void *priv UNUSED, mmbuffer_t *mb, int nbuf)
 {
 	int i;
 	for (i = 0; i < nbuf; i++)
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -776,7 +776,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 }
 
 static void count_diff_files(struct diff_queue_struct *q,
-			     struct diff_options *opt, void *data)
+			     struct diff_options *opt UNUSED, void *data)
 {
 	int *count = data;
 
diff --git a/builtin/rerere.c b/builtin/rerere.c
@@ -14,7 +14,7 @@ static const char * const rerere_usage[] = {
 	NULL,
 };
 
-static int outf(void *dummy, mmbuffer_t *ptr, int nbuf)
+static int outf(void *dummy UNUSED, mmbuffer_t *ptr, int nbuf)
 {
 	int i;
 	for (i = 0; i < nbuf; i++)
diff --git a/builtin/reset.c b/builtin/reset.c
@@ -133,7 +133,8 @@ static void print_new_head_line(struct commit *commit)
 }
 
 static void update_index_from_diff(struct diff_queue_struct *q,
-		struct diff_options *opt, void *data)
+				   struct diff_options *opt UNUSED,
+				   void *data)
 {
 	int i;
 	int intent_to_add = *(int *)data;
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
@@ -1043,7 +1043,7 @@ static void prepare_submodule_summary(struct summary_cb *info,
 }
 
 static void submodule_summary_callback(struct diff_queue_struct *q,
-				       struct diff_options *options,
+				       struct diff_options *options UNUSED,
 				       void *data)
 {
 	int i;
diff --git a/combine-diff.c b/combine-diff.c
@@ -372,7 +372,7 @@ struct combine_diff_state {
 static void consume_hunk(void *state_,
 			 long ob, long on,
 			 long nb, long nn,
-			 const char *funcline, long funclen)
+			 const char *func UNUSED, long funclen UNUSED)
 {
 	struct combine_diff_state *state = state_;
 
diff --git a/diff-lib.c b/diff-lib.c
@@ -673,7 +673,7 @@ int index_differs_from(struct repository *r,
 	return (has_changes != 0);
 }
 
-static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
+static struct strbuf *idiff_prefix_cb(struct diff_options *opt UNUSED, void *data)
 {
 	return data;
 }
diff --git a/diff.c b/diff.c
@@ -1954,7 +1954,7 @@ static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
 static void fn_out_diff_words_aux(void *priv,
 				  long minus_first, long minus_len,
 				  long plus_first, long plus_len,
-				  const char *func, long funclen)
+				  const char *func UNUSED, long funclen UNUSED)
 {
 	struct diff_words_data *diff_words = priv;
 	struct diff_words_style *style = diff_words->style;
@@ -3184,8 +3184,9 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l
 }
 
 static void checkdiff_consume_hunk(void *priv,
-				   long ob, long on, long nb, long nn,
-				   const char *func, long funclen)
+				   long ob UNUSED, long on UNUSED,
+				   long nb, long nn UNUSED,
+				   const char *func UNUSED, long funclen UNUSED)
 
 {
 	struct checkdiff_t *data = priv;
diff --git a/range-diff.c b/range-diff.c
@@ -269,14 +269,18 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
 	hashmap_clear(&map);
 }
 
-static int diffsize_consume(void *data, char *line, unsigned long len)
+static int diffsize_consume(void *data,
+			     char *line UNUSED,
+			     unsigned long len UNUSED)
 {
 	(*(int *)data)++;
 	return 0;
 }
 
-static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,
-			  const char *funcline, long funclen)
+static void diffsize_hunk(void *data,
+			  long ob UNUSED, long on UNUSED,
+			  long nb UNUSED, long nn UNUSED,
+			  const char *func UNUSED, long funclen UNUSED)
 {
 	diffsize_consume(data, NULL, 0);
 }
@@ -461,7 +465,7 @@ static void patch_diff(const char *a, const char *b,
 	diff_flush(diffopt);
 }
 
-static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
+static struct strbuf *output_prefix_cb(struct diff_options *opt UNUSED, void *data)
 {
 	return data;
 }
diff --git a/revision.c b/revision.c
@@ -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;
diff --git a/submodule.c b/submodule.c
@@ -832,7 +832,7 @@ static void changed_submodule_data_clear(struct changed_submodule_data *cs_data)
 }
 
 static void collect_changed_submodules_cb(struct diff_queue_struct *q,
-					  struct diff_options *options,
+					  struct diff_options *options UNUSED,
 					  void *data)
 {
 	struct collect_changed_submodules_cb_data *me = data;
diff --git a/wt-status.c b/wt-status.c
@@ -438,7 +438,7 @@ static char short_submodule_status(struct wt_status_change_data *d)
 }
 
 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
-					 struct diff_options *options,
+					 struct diff_options *options UNUSED,
 					 void *data)
 {
 	struct wt_status *s = data;
@@ -525,7 +525,7 @@ static int unmerged_mask(struct index_state *istate, const char *path)
 }
 
 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
-					 struct diff_options *options,
+					 struct diff_options *options UNUSED,
 					 void *data)
 {
 	struct wt_status *s = data;

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ static int run_update(struct add_i_state s, const struct pathspec ps,`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`static void revert_from_diff(struct diff_queue_struct *q,`
`727`		`- struct diff_options opt, void data)`
	`727`	`+ struct diff_options opt, void data UNUSED)`
`728`	`728`	`{`
`729`	`729`	`int i, add_flags = ADD_CACHE_OK_TO_ADD \| ADD_CACHE_OK_TO_REPLACE;`
`730`	`730`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static int fix_unmerged_status(struct diff_filepair *p,`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`static void update_callback(struct diff_queue_struct *q,`
`91`		`- struct diff_options opt, void cbdata)`
	`91`	`+ struct diff_options opt UNUSED, void cbdata)`
`92`	`92`	`{`
`93`	`93`	`int i;`
`94`	`94`	`struct update_callback_data *data = cbdata;`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ static const char anonymize_oid(const char oid_hex)`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`static void show_filemodify(struct diff_queue_struct *q,`
`412`		`- struct diff_options options, void data)`
	`412`	`+ struct diff_options options UNUSED, void data)`
`413`	`413`	`{`
`414`	`414`	`int i;`
`415`	`415`	`struct string_list *changed = data;`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static void origin(struct merge_list entry, unsigned long *size)`
`98`	`98`	`return NULL;`
`99`	`99`	`}`
`100`	`100`
`101`		`-static int show_outf(void priv_, mmbuffer_t mb, int nbuf)`
	`101`	`+static int show_outf(void priv UNUSED, mmbuffer_t mb, int nbuf)`
`102`	`102`	`{`
`103`	`103`	`int i;`
`104`	`104`	`for (i = 0; i < nbuf; i++)`
Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ static int try_merge_strategy(const char strategy, struct commit_list common,`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`static void count_diff_files(struct diff_queue_struct *q,`
`779`		`- struct diff_options opt, void data)`
	`779`	`+ struct diff_options opt UNUSED, void data)`
`780`	`780`	`{`
`781`	`781`	`int *count = data;`
`782`	`782`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ static const char * const rerere_usage[] = {`
`14`	`14`	`NULL,`
`15`	`15`	`};`
`16`	`16`
`17`		`-static int outf(void dummy, mmbuffer_t ptr, int nbuf)`
	`17`	`+static int outf(void dummy UNUSED, mmbuffer_t ptr, int nbuf)`
`18`	`18`	`{`
`19`	`19`	`int i;`
`20`	`20`	`for (i = 0; i < nbuf; i++)`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ static void print_new_head_line(struct commit *commit)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`static void update_index_from_diff(struct diff_queue_struct *q,`
`136`		`- struct diff_options opt, void data)`
	`136`	`+ struct diff_options *opt UNUSED,`
	`137`	`+ void *data)`
`137`	`138`	`{`
`138`	`139`	`int i;`
`139`	`140`	`int intent_to_add = (int )data;`
Original file line number	Diff line number	Diff line change
`@@ -1043,7 +1043,7 @@ static void prepare_submodule_summary(struct summary_cb *info,`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`	`1045`	`static void submodule_summary_callback(struct diff_queue_struct *q,`
`1046`		`- struct diff_options *options,`
	`1046`	`+ struct diff_options *options UNUSED,`
`1047`	`1047`	`void *data)`
`1048`	`1048`	`{`
`1049`	`1049`	`int i;`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ struct combine_diff_state {`
`372`	`372`	`static void consume_hunk(void *state_,`
`373`	`373`	`long ob, long on,`
`374`	`374`	`long nb, long nn,`
`375`		`- const char *funcline, long funclen)`
	`375`	`+ const char *func UNUSED, long funclen UNUSED)`
`376`	`376`	`{`
`377`	`377`	`struct combine_diff_state *state = state_;`
`378`	`378`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ int index_differs_from(struct repository *r,`
`673`	`673`	`return (has_changes != 0);`
`674`	`674`	`}`
`675`	`675`
`676`		`-static struct strbuf idiff_prefix_cb(struct diff_options opt, void *data)`
	`676`	`+static struct strbuf idiff_prefix_cb(struct diff_options opt UNUSED, void *data)`
`677`	`677`	`{`
`678`	`678`	`return data;`
`679`	`679`	`}`