mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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>
This commit is contained in:
parent
0b4e9013f1
commit
ee550abcce
1 changed files with 3 additions and 1 deletions
|
@ -324,7 +324,9 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
|
|||
* The successful merge rules are the same as for the three-way merge
|
||||
* in git-read-tree.
|
||||
*/
|
||||
static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
|
||||
static int threeway_callback(int n UNUSED, unsigned long mask,
|
||||
unsigned long dirmask UNUSED,
|
||||
struct name_entry *entry, struct traverse_info *info)
|
||||
{
|
||||
/* Same in both? */
|
||||
if (same_entry(entry+1, entry+2) || both_empty(entry+1, entry+2)) {
|
||||
|
|
Loading…
Reference in a new issue