merge-recursive: remove return value from get_files_dirs

Kevin Willford · gitster · commit ef9c4dc3b6a4 · 2017-09-06T13:10:21.000+09:00
The return value of the get_files_dirs call is never being used.
Looking at the history of the file and it was originally only
being used for debug output statements.  Also when
read_tree_recursive return value is non zero it is changed to
zero.  This leads me to believe that it doesn't matter if
read_tree_recursive gets an error.

Since the debug output has been removed and the caller isn't
checking the return value there is no reason to keep calculating
and returning a value.

Signed-off-by: Kevin Willford &lt;kewillf@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -328,15 +328,11 @@ static int save_files_dirs(const unsigned char *sha1,
 	return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
 }
 
-static int get_files_dirs(struct merge_options *o, struct tree *tree)
+static void get_files_dirs(struct merge_options *o, struct tree *tree)
 {
-	int n;
 	struct pathspec match_all;
 	memset(&match_all, 0, sizeof(match_all));
-	if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
-		return 0;
-	n = o->current_file_set.nr + o->current_directory_set.nr;
-	return n;
+	read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -328,15 +328,11 @@ static int save_files_dirs(const unsigned char *sha1,`
`328`	`328`	`return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);`
`329`	`329`	`}`
`330`	`330`
`331`		`-static int get_files_dirs(struct merge_options o, struct tree tree)`
	`331`	`+static void get_files_dirs(struct merge_options o, struct tree tree)`
`332`	`332`	`{`
`333`		`- int n;`
`334`	`333`	`struct pathspec match_all;`
`335`	`334`	`memset(&match_all, 0, sizeof(match_all));`
`336`		`- if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))`
`337`		`- return 0;`
`338`		`- n = o->current_file_set.nr + o->current_directory_set.nr;`
`339`		`- return n;`
	`335`	`+ read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);`
`340`	`336`	`}`
`341`	`337`
`342`	`338`	`/*`