merge-tree: remove unused df_conflict arguments

rscharfe · gitster · commit 57065289a9ef · 2014-09-02T11:02:58.000-07:00
merge_trees_recursive() stores a pointer to its parameter df_conflict in
its struct traverse_info, but it is never actually used.  Stop doing
that, remove the parameter and inline the function into merge_trees(),
as the latter is now only passing on its parameters.

Remove the parameter df_conflict from unresolved_directory() as well,
now that there is no way to pass it to merge_trees_recursive() through
that function anymore.

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
@@ -25,7 +25,7 @@ static void add_merge_entry(struct merge_list *entry)
 	merge_result_end = &entry->next;
 }
 
-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict);
+static void merge_trees(struct tree_desc t[3], const char *base);
 
 static const char *explanation(struct merge_list *entry)
 {
@@ -195,8 +195,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s
 	add_merge_entry(final);
 }
 
-static void unresolved_directory(const struct traverse_info *info, struct name_entry n[3],
-				 int df_conflict)
+static void unresolved_directory(const struct traverse_info *info,
+				 struct name_entry n[3])
 {
 	char *newbase;
 	struct name_entry *p;
@@ -218,7 +218,7 @@ static void unresolved_directory(const struct traverse_info *info, struct name_e
 	buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
 #undef ENTRY_SHA1
 
-	merge_trees_recursive(t, newbase, df_conflict);
+	merge_trees(t, newbase);
 
 	free(buf0);
 	free(buf1);
@@ -259,7 +259,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
 			dirmask |= (1 << i);
 	}
 
-	unresolved_directory(info, n, dirmask && (dirmask != mask));
+	unresolved_directory(info, n);
 
 	if (dirmask == mask)
 		return;
@@ -335,21 +335,15 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s
 	return mask;
 }
 
-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict)
+static void merge_trees(struct tree_desc t[3], const char *base)
 {
 	struct traverse_info info;
 
 	setup_traverse_info(&info, base);
-	info.data = &df_conflict;
 	info.fn = threeway_callback;
 	traverse_trees(3, t, &info);
 }
 
-static void merge_trees(struct tree_desc t[3], const char *base)
-{
-	merge_trees_recursive(t, base, 0);
-}
-
 static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
 {
 	unsigned char sha1[20];

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ static void add_merge_entry(struct merge_list *entry)`
`25`	`25`	`merge_result_end = &entry->next;`
`26`	`26`	`}`
`27`	`27`
`28`		`-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict);`
	`28`	`+static void merge_trees(struct tree_desc t[3], const char *base);`
`29`	`29`
`30`	`30`	`static const char explanation(struct merge_list entry)`
`31`	`31`	`{`
`@@ -195,8 +195,8 @@ static void resolve(const struct traverse_info info, struct name_entry ours, s`
`195`	`195`	`add_merge_entry(final);`
`196`	`196`	`}`
`197`	`197`
`198`		`-static void unresolved_directory(const struct traverse_info *info, struct name_entry n[3],`
`199`		`- int df_conflict)`
	`198`	`+static void unresolved_directory(const struct traverse_info *info,`
	`199`	`+ struct name_entry n[3])`
`200`	`200`	`{`
`201`	`201`	`char *newbase;`
`202`	`202`	`struct name_entry *p;`
`@@ -218,7 +218,7 @@ static void unresolved_directory(const struct traverse_info *info, struct name_e`
`218`	`218`	`buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));`
`219`	`219`	`#undef ENTRY_SHA1`
`220`	`220`
`221`		`- merge_trees_recursive(t, newbase, df_conflict);`
	`221`	`+ merge_trees(t, newbase);`
`222`	`222`
`223`	`223`	`free(buf0);`
`224`	`224`	`free(buf1);`
`@@ -259,7 +259,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])`
`259`	`259`	`dirmask \|= (1 << i);`
`260`	`260`	`}`
`261`	`261`
`262`		`- unresolved_directory(info, n, dirmask && (dirmask != mask));`
	`262`	`+ unresolved_directory(info, n);`
`263`	`263`
`264`	`264`	`if (dirmask == mask)`
`265`	`265`	`return;`
`@@ -335,21 +335,15 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s`
`335`	`335`	`return mask;`
`336`	`336`	`}`
`337`	`337`
`338`		`-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict)`
	`338`	`+static void merge_trees(struct tree_desc t[3], const char *base)`
`339`	`339`	`{`
`340`	`340`	`struct traverse_info info;`
`341`	`341`
`342`	`342`	`setup_traverse_info(&info, base);`
`343`		`- info.data = &df_conflict;`
`344`	`343`	`info.fn = threeway_callback;`
`345`	`344`	`traverse_trees(3, t, &info);`
`346`	`345`	`}`
`347`	`346`
`348`		`-static void merge_trees(struct tree_desc t[3], const char *base)`
`349`		`-{`
`350`		`- merge_trees_recursive(t, base, 0);`
`351`		`-}`
`352`		`-`
`353`	`347`	`static void get_tree_descriptor(struct tree_desc desc, const char *rev)`
`354`	`348`	`{`
`355`	`349`	`unsigned char sha1[20];`