[PATCH v4 1/5] difftool: print_tool_help() globals

From

David Aguilar <davvid@gmail.com>

Date

Jul 25, 2012, 02:59 UTC

Message-ID

<1343185173-48278-2-git-send-email-davvid@gmail.com>

In-Reply-To

<1343185173-48278-1-git-send-email-davvid@gmail.com>

Replace a global variable with a closure.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
Differences from last time:

 git-difftool.perl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/git-difftool.perl b/git-difftool.perl
index c079854..d4737e1 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -23,7 +23,6 @@ use File::Temp qw(tempdir);
 use Getopt::Long qw(:config pass_through);
 use Git;
 
-my @tools;
 my @working_tree;
 my $rc;
 my $repo = Git->repository();
@@ -67,6 +66,7 @@ my $workdir = find_worktree();
 
 sub filter_tool_scripts
 {
+	my ($tools) = @_;
 	if (-d $_) {
 		if ($_ ne ".") {
 			# Ignore files in subdirectories
@@ -74,17 +74,17 @@ sub filter_tool_scripts
 		}
 	} else {
 		if ((-f $_) && ($_ ne "defaults")) {
-			push(@tools, $_);
+			push(@$tools, $_);
 		}
 	}
 }
 
 sub print_tool_help
 {
-	my ($cmd, @found, @notfound);
+	my ($cmd, @found, @notfound, @tools);
 	my $gitpath = Git::exec_path();
 
-	find(\&filter_tool_scripts, "$gitpath/mergetools");
+	find(sub { filter_tool_scripts(\@tools) }, "$gitpath/mergetools");
 
 	foreach my $tool (@tools) {
 		$cmd  = "TOOL_MODE=diff";

-- 
1.7.12.rc0.15.g8157c39