diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2020-04-13 12:06:11 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2020-04-13 12:06:11 -0400 |
| commit | 8f00d84afc0dad577b65df5a313e5306cee3d11f (patch) | |
| tree | 25c63a3060ecf5163c849d0f5d0436668d37aaaf | |
| parent | 7be5d8df1f74b78620167d3abf32ee607e728919 (diff) | |
| download | postgresql-8f00d84afc0dad577b65df5a313e5306cee3d11f.tar.gz postgresql-8f00d84afc0dad577b65df5a313e5306cee3d11f.zip | |
Use perl's $/ more idiomatically
This replaces a few occurrences of ugly code with a more clean and
idiomatic usage. The problem was highlighted by perlcritic, but we're
not enforcing the policy that led to the discovery.
Discussion: https://postgr.es/m/20200412074245.GB623763@rfd.leadboat.com
| -rw-r--r-- | src/tools/msvc/Install.pm | 5 | ||||
| -rw-r--r-- | src/tools/msvc/Project.pm | 10 | ||||
| -rwxr-xr-x | src/tools/win32tzlist.pl | 9 |
3 files changed, 8 insertions, 16 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 1a92ed233ab..e65ac6fc664 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -762,13 +762,10 @@ sub read_file { my $filename = shift; my $F; - my $t = $/; - - undef $/; + local $/ = undef; open($F, '<', $filename) || die "Could not open file $filename\n"; my $txt = <$F>; close($F); - $/ = $t; return $txt; } diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index d90a996d467..20f79b382b1 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -420,13 +420,10 @@ sub read_file { my $filename = shift; my $F; - my $t = $/; - - undef $/; + local $/ = undef; open($F, '<', $filename) || croak "Could not open file $filename\n"; my $txt = <$F>; close($F); - $/ = $t; return $txt; } @@ -435,15 +432,12 @@ sub read_makefile { my $reldir = shift; my $F; - my $t = $/; - - undef $/; + local $/ = undef; open($F, '<', "$reldir/GNUmakefile") || open($F, '<', "$reldir/Makefile") || confess "Could not open $reldir/Makefile\n"; my $txt = <$F>; close($F); - $/ = $t; return $txt; } diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl index 25f7efbc588..97484016bb9 100755 --- a/src/tools/win32tzlist.pl +++ b/src/tools/win32tzlist.pl @@ -60,12 +60,13 @@ $basekey->Close(); # Fetch all timezones currently in the file # my @file_zones; +my $pgtz; open(my $tzfh, '<', $tzfile) or die "Could not open $tzfile!\n"; -my $t = $/; -undef $/; -my $pgtz = <$tzfh>; +{ + local $/ = undef; + $pgtz = <$tzfh>; +} close($tzfh); -$/ = $t; # Attempt to locate and extract the complete win32_tzmap struct $pgtz =~ /win32_tzmap\[\] =\s+{\s+\/\*[^\/]+\*\/\s+(.+?)};/gs |