{"thread":{"id":"37463","subject":"[PATCH] merge-tree: remove unused df_conflict arguments","startedAt":"2014-08-30T21:40:34Z","lastAt":"2014-08-30T21:40:34Z","messageCount":1,"participants":["René Scharfe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"248667","messageId":"540244D2.6070403@web.de","threadId":"37463","inReplyTo":null,"subject":"[PATCH] merge-tree: remove unused df_conflict arguments","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2014-08-30T21:40:34Z","receivedAt":"2014-08-30T21:40:34Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"merge_trees_recursive() stores a pointer to its parameter df_conflict in\nits struct traverse_info, but it is never actually used.  Stop doing\nthat, remove the parameter and inline the function into merge_trees(),\nas the latter is now only passing on its parameters.\n\nRemove the parameter df_conflict from unresolved_directory() as well,\nnow that there is no way to pass it to merge_trees_recursive() through\nthat function anymore.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\n---\n builtin/merge-tree.c | 18 ++++++------------\n 1 file changed, 6 insertions(+), 12 deletions(-)\n\ndiff --git a/builtin/merge-tree.c b/builtin/merge-tree.c\nindex 61cbde4..f9ab485 100644\n--- a/builtin/merge-tree.c\n+++ b/builtin/merge-tree.c\n@@ -25,7 +25,7 @@ static void add_merge_entry(struct merge_list *entry)\n \tmerge_result_end = &entry->next;\n }\n \n-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict);\n+static void merge_trees(struct tree_desc t[3], const char *base);\n \n static const char *explanation(struct merge_list *entry)\n {\n@@ -195,8 +195,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s\n \tadd_merge_entry(final);\n }\n \n-static void unresolved_directory(const struct traverse_info *info, struct name_entry n[3],\n-\t\t\t\t int df_conflict)\n+static void unresolved_directory(const struct traverse_info *info,\n+\t\t\t\t struct name_entry n[3])\n {\n \tchar *newbase;\n \tstruct name_entry *p;\n@@ -218,7 +218,7 @@ static void unresolved_directory(const struct traverse_info *info, struct name_e\n \tbuf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));\n #undef ENTRY_SHA1\n \n-\tmerge_trees_recursive(t, newbase, df_conflict);\n+\tmerge_trees(t, newbase);\n \n \tfree(buf0);\n \tfree(buf1);\n@@ -259,7 +259,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])\n \t\t\tdirmask |= (1 << i);\n \t}\n \n-\tunresolved_directory(info, n, dirmask && (dirmask != mask));\n+\tunresolved_directory(info, n);\n \n \tif (dirmask == mask)\n \t\treturn;\n@@ -335,21 +335,15 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s\n \treturn mask;\n }\n \n-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict)\n+static void merge_trees(struct tree_desc t[3], const char *base)\n {\n \tstruct traverse_info info;\n \n \tsetup_traverse_info(&info, base);\n-\tinfo.data = &df_conflict;\n \tinfo.fn = threeway_callback;\n \ttraverse_trees(3, t, &info);\n }\n \n-static void merge_trees(struct tree_desc t[3], const char *base)\n-{\n-\tmerge_trees_recursive(t, base, 0);\n-}\n-\n static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)\n {\n \tunsigned char sha1[20];\n-- \n2.1.0\n"}]}