merge-tree: mark unused parameter in traverse callback
Our threeway_callback() does not bother to look at its "n" parameter. It is static in this file and used only by trivial_merge_trees(), which always passes 3 trees (hence the name "threeway"). It also does not look at "dirmask". This is OK, as it handles directories specifically by looking at the mode bits. Other traverse_info callbacks need these, so we can't get drop them from the interface. But let's annotate these ones to avoid complaints from -Wunused-parameter. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 3, 2023 at 02:44 UTC
ee550abcce86e27c0be3593a4c9af4dc7322039a
1 file changed
+3
-1
builtin/merge-tree.c
+3
-1
@@ -324,7 +324,9 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
324
* The successful merge rules are the same as for the three-way merge
325
* in git-read-tree.
326
*/
327
-static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
327
+static int threeway_callback(int n UNUSED, unsigned long mask,
328
+ unsigned long dirmask UNUSED,
329
+ struct name_entry *entry, struct traverse_info *info)
330
{
331
/* Same in both? */
332
if (same_entry(entry+1, entry+2) || both_empty(entry+1, entry+2)) {