From 3cf2dd8247aea43221bfef98b8afcc3845ead4f9 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Tue, 11 Jul 2017 17:37:20 +0100
Subject: Remove use of global barewords in most file handling code.

This is not considered good practise in modern Perl code.

A few cases of this still remain in code which is due to be
rewritten anyway.
---
 make/configure.pm | 18 +++++++++---------
 make/directive.pm |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/configure.pm b/make/configure.pm
index 48bd8db38..dbbbf6509 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -208,9 +208,9 @@ sub test_file($$;$) {
 sub test_header($$;$) {
 	my ($compiler, $header, $args) = @_;
 	$args //= '';
-	open(COMPILER, "| $compiler -E - $args ${\CONFIGURE_ERROR_PIPE}") or return 0;
-	print COMPILER "#include <$header>";
-	close(COMPILER);
+	open(my $fh, "| $compiler -E - $args ${\CONFIGURE_ERROR_PIPE}") or return 0;
+	print $fh "#include <$header>";
+	close $fh;
 	return !$?;
 }
 
@@ -257,11 +257,11 @@ sub parse_templates($$$) {
 	# Iterate through files in make/template.
 	foreach (<make/template/*>) {
 		print_format "Parsing <|GREEN $_|> ...\n";
-		open(TEMPLATE, $_) or print_error "unable to read $_: $!";
+		open(my $fh, $_) or print_error "unable to read $_: $!";
 		my (@lines, $mode, @platforms, %targets);
 
 		# First pass: parse template variables and directives.
-		while (my $line = <TEMPLATE>) {
+		while (my $line = <$fh>) {
 			chomp $line;
 
 			# Does this line match a variable?
@@ -301,7 +301,7 @@ sub parse_templates($$$) {
 			}
 			push @lines, $line;
 		}
-		close(TEMPLATE);
+		close $fh;
 
 		# Only proceed if this file should be templated on this platform.
 		if ($#platforms < 0 || grep { $_ eq $^O } @platforms) {
@@ -397,11 +397,11 @@ sub parse_templates($$$) {
 
 				# Write the template file.
 				print_format "Writing <|GREEN $target|> ...\n";
-				open(TARGET, '>', $target) or print_error "unable to write $target: $!";
+				open(my $fh, '>', $target) or print_error "unable to write $target: $!";
 				foreach (@final_lines) {
-					say TARGET $_;
+					say $fh $_;
 				}
-				close(TARGET);
+				close $fh;
 
 				# Set file permissions.
 				if (defined $mode) {
diff --git a/make/directive.pm b/make/directive.pm
index 4501fc5ec..2e9e7ed61 100644
--- a/make/directive.pm
+++ b/make/directive.pm
@@ -41,16 +41,16 @@ our @EXPORT = qw(get_directive
 sub get_directive($$;$)
 {
 	my ($file, $property, $default) = @_;
-	open(MODULE, $file) or return $default;
+	open(my $fh, $file) or return $default;
 
 	my $value = '';
-	while (<MODULE>) {
+	while (<$fh>) {
 		if ($_ =~ /^\/\* \$(\S+): (.+) \*\/$/ || $_ =~ /^\/\/\/ \$(\S+): (.+)/) {
 			next unless $1 eq $property;
 			$value .= ' ' . execute_functions($file, $1, $2);
 		}
 	}
-	close(MODULE);
+	close $fh;
 
 	# Strip all extraneous whitespace.
 	$value =~ s/^\s+|\s+$//g;
-- 
cgit v1.2.3