unused parameters in merge-recursive.c
- From
Jeff King <peff@peff.net>
- Date
- Oct 19, 2018, 17:18 UTC
- Message-ID
- <20181019171827.GA21091@sigill.intra.peff.net>
Hi Elijah,
Playing with -Wunused-parameters, I notice there are several functions with unused parameters in merge-recursive.c. The patch below drops them all. We know they're not being used, so it can't make anything _worse_, but this is a good opportunity to confirm that they don't represent some latent bug.
In most cases I've been trying to determine the "bug versus cruft" thing myself, but I fear that merge-recursive exceeds my abilities here. ;)
--- merge-recursive.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index c0fb83d285..f6d634c3a2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1369,8 +1369,7 @@ static int merge_mode_and_contents(struct merge_options *o, static int handle_rename_via_dir(struct merge_options *o, struct diff_filepair *pair, - const char *rename_branch, - const char *other_branch) + const char *rename_branch) { /* * Handle file adds that need to be renamed due to directory rename @@ -2071,8 +2070,7 @@ static void handle_directory_level_conflicts(struct merge_options *o, remove_hashmap_entries(dir_re_merge, &remove_from_merge); } -static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs, - struct tree *tree) +static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs) { struct hashmap *dir_renames; struct hashmap_iter iter; @@ -2318,8 +2316,7 @@ static void apply_directory_rename_modifications(struct merge_options *o, struct tree *o_tree, struct tree *a_tree, struct tree *b_tree, - struct string_list *entries, - int *clean) + struct string_list *entries) { struct string_list_item *item; int stage = (tree == a_tree ? 2 : 3); @@ -2490,8 +2487,7 @@ static struct string_list *get_renames(struct merge_options *o, apply_directory_rename_modifications(o, pair, new_path, re, tree, o_tree, a_tree, b_tree, - entries, - clean_merge); + entries); } hashmap_iter_init(&collisions, &iter); @@ -2826,8 +2822,8 @@ static int detect_and_process_renames(struct merge_options *o, merge_pairs = get_diffpairs(o, common, merge); if (o->detect_directory_renames) { - dir_re_head = get_directory_renames(head_pairs, head); - dir_re_merge = get_directory_renames(merge_pairs, merge); + dir_re_head = get_directory_renames(head_pairs); + dir_re_merge = get_directory_renames(merge_pairs); handle_directory_level_conflicts(o, dir_re_head, head, @@ -3149,8 +3145,7 @@ static int process_entry(struct merge_options *o, clean_merge = 1; if (handle_rename_via_dir(o, conflict_info->pair1, - conflict_info->branch1, - conflict_info->branch2)) + conflict_info->branch1)) clean_merge = -1; break; case RENAME_DELETE:
-- 2.19.1.1089.g69f65ee796