From f04d4ac919b9ae9b57e977523e4b40979aa8b951 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Wed, 25 Apr 2018 14:00:19 -0400
Subject: Reindent Perl files with perltidy version 20170521.

Discussion: https://postgr.es/m/CABUevEzK3cNiHZQ18f5tK0guoT+cN_jWeVzhYYxY=r+1Q3SmoA@mail.gmail.com
---
 src/tools/git_changelog            |  6 +++---
 src/tools/msvc/Install.pm          | 10 +++++-----
 src/tools/msvc/Mkvcbuild.pm        | 25 +++++++++++++------------
 src/tools/msvc/Project.pm          |  2 +-
 src/tools/msvc/Solution.pm         | 30 ++++++++++++++----------------
 src/tools/msvc/VSObjectFactory.pm  | 15 ++++++++++-----
 src/tools/msvc/gendef.pl           |  4 ++--
 src/tools/msvc/vcregress.pl        |  9 ++++++---
 src/tools/pginclude/pgcheckdefines |  2 +-
 src/tools/pgindent/pgindent        |  9 ++++-----
 10 files changed, 59 insertions(+), 53 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index 2fc1565a6c3..5c41efa701b 100755
--- a/src/tools/git_changelog
+++ b/src/tools/git_changelog
@@ -102,9 +102,9 @@ my %rel_tags;
 		{
 			my $commit = $1;
 			my $tag    = $2;
-			if ($tag =~ /^REL_\d+_\d+$/
-			    || $tag =~ /^REL\d+_\d+$/
-			    || $tag =~ /^REL\d+_\d+_\d+$/)
+			if (   $tag =~ /^REL_\d+_\d+$/
+				|| $tag =~ /^REL\d+_\d+$/
+				|| $tag =~ /^REL\d+_\d+_\d+$/)
 			{
 				$rel_tags{$commit} = $tag;
 			}
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 82528eaa283..578426994d3 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -101,7 +101,7 @@ sub Install
 
 				# Don't find files of in-tree temporary installations.
 				$_ eq 'share' and $File::Find::prune = 1;
-			  }
+			}
 		},
 		@top_dir);
 	CopySetOfFiles('config files', $sample_files, $target . '/share/');
@@ -135,8 +135,8 @@ sub Install
 			'Information schema data', $target . '/share/',
 			'src/backend/catalog/',    'sql_features.txt');
 		CopyFiles(
-			'Error code data', $target . '/share/',
-			'src/backend/utils/',    'errcodes.txt');
+			'Error code data',    $target . '/share/',
+			'src/backend/utils/', 'errcodes.txt');
 		GenerateConversionScript($target);
 		GenerateTimezoneFiles($target, $conf);
 		GenerateTsearchFiles($target);
@@ -161,7 +161,7 @@ sub Install
 
 					# Don't find files of in-tree temporary installations.
 					$_ eq 'share' and $File::Find::prune = 1;
-				  }
+				}
 			},
 			@pldirs);
 		CopySetOfFiles('PL Extension files',
@@ -693,7 +693,7 @@ sub GenerateNLSFiles
 		{   wanted => sub {
 				/^nls\.mk\z/s
 				  && !push(@flist, $File::Find::name);
-			  }
+			}
 		},
 		"src");
 	foreach (@flist)
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 1d3ed6b0b10..d6d7b7a860f 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -530,11 +530,12 @@ sub mkvcbuild
 
 		my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
 
-		# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
-		# Starting with ActivePerl 5.24, both  perlnn.lib and libperlnn.a are provided.
-		# In this case, prefer .lib.
+# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
+# Starting with ActivePerl 5.24, both  perlnn.lib and libperlnn.a are provided.
+# In this case, prefer .lib.
 		my @perl_libs =
-		  reverse sort grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
+		  reverse sort grep { /perl\d+\.lib$|libperl\d+\.a$/ }
+		  glob($perl_path);
 		if (@perl_libs > 0)
 		{
 			$plperl->AddLibrary($perl_libs[0]);
@@ -753,7 +754,7 @@ sub mkvcbuild
 			'hstore',        'contrib/hstore');
 		my $jsonb_plperl = AddTransformModule(
 			'jsonb_plperl', 'contrib/jsonb_plperl',
-			'plperl',        'src/pl/plperl');
+			'plperl',       'src/pl/plperl');
 
 		foreach my $f (@perl_embed_ccflags)
 		{
@@ -856,12 +857,12 @@ sub AddSimpleFrontend
 # Add a simple transform module
 sub AddTransformModule
 {
-	my $n              = shift;
-	my $n_src          = shift;
-	my $pl_proj_name   = shift;
-	my $pl_src         = shift;
-	my $type_name      = shift;
-	my $type_src       = shift;
+	my $n            = shift;
+	my $n_src        = shift;
+	my $pl_proj_name = shift;
+	my $pl_src       = shift;
+	my $type_name    = shift;
+	my $type_src     = shift;
 
 	my $type_proj = undef;
 	if ($type_name)
@@ -995,7 +996,7 @@ sub GenerateContribSqlFiles
 				print "Building $out from $in (contrib/$n)...\n";
 				my $cont = Project::read_file("contrib/$n/$in");
 				my $dn   = $out;
-				$dn   =~ s/\.sql$//;
+				$dn =~ s/\.sql$//;
 				$cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
 				my $o;
 				open($o, '>', "contrib/$n/$out")
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index 9817b9439a9..7ccfd7bf2f1 100644
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -192,7 +192,7 @@ sub AddDir
 		{
 			next
 			  if $subdir eq "\$(top_builddir)/src/timezone"
-			;    #special case for non-standard include
+			  ;    #special case for non-standard include
 			next
 			  if $reldir . "/" . $subdir eq "src/backend/port/darwin";
 
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index f9534605231..696433d272b 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -51,7 +51,7 @@ sub _new
 	  unless $options->{wal_blocksize};    # undef or 0 means default
 	die "Bad wal_blocksize $options->{wal_blocksize}"
 	  unless grep { $_ == $options->{wal_blocksize} }
-		  (1, 2, 4, 8, 16, 32, 64);
+	  (1, 2, 4, 8, 16, 32, 64);
 	$options->{wal_segsize} = 16
 	  unless $options->{wal_segsize};      # undef or 0 means default
 	die "Bad wal_segsize $options->{wal_segsize}"
@@ -176,8 +176,7 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 		  "\n";
 		print $o "#define RELSEG_SIZE ",
 		  (1024 / $self->{options}->{blocksize}) *
-		  $self->{options}->{segsize} *
-		  1024, "\n";
+		  $self->{options}->{segsize} * 1024, "\n";
 		print $o "#define XLOG_BLCKSZ ",
 		  1024 * $self->{options}->{wal_blocksize}, "\n";
 
@@ -266,17 +265,14 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 
 	chdir('src/backend/utils');
 	my $pg_language_dat = '../../../src/include/catalog/pg_language.dat';
-	my $pg_proc_dat = '../../../src/include/catalog/pg_proc.dat';
-	if (IsNewer(
-			'fmgrtab.c', $pg_language_dat)
-		|| IsNewer(
-			'fmgrtab.c', $pg_proc_dat)
-		|| IsNewer(
-			'fmgrtab.c', '../../../src/include/access/transam.h')
-		)
+	my $pg_proc_dat     = '../../../src/include/catalog/pg_proc.dat';
+	if (   IsNewer('fmgrtab.c', $pg_language_dat)
+		|| IsNewer('fmgrtab.c', $pg_proc_dat)
+		|| IsNewer('fmgrtab.c', '../../../src/include/access/transam.h'))
 	{
 		system(
-"perl -I ../catalog Gen_fmgrtab.pl -I../../../src/include/ $pg_language_dat $pg_proc_dat");
+"perl -I ../catalog Gen_fmgrtab.pl -I../../../src/include/ $pg_language_dat $pg_proc_dat"
+		);
 	}
 	chdir('../../..');
 
@@ -471,6 +467,7 @@ EOF
 	$mf =~ /^POSTGRES_BKI_DATA\s*:?=[^,]+,(.*)\)$/gm
 	  || croak "Could not find POSTGRES_BKI_DATA in Makefile\n";
 	my @bki_data = split /\s+/, $1;
+
 	foreach my $bki (@bki_srcs, @bki_data)
 	{
 		next if $bki eq "";
@@ -480,19 +477,20 @@ EOF
 		{
 			chdir('src/backend/catalog');
 			my $bki_srcs = join(' ../../../src/include/catalog/', @bki_srcs);
-			system("perl genbki.pl --set-version=$self->{majorver} $bki_srcs");
+			system(
+				"perl genbki.pl --set-version=$self->{majorver} $bki_srcs");
 			chdir('../../..');
 
 			# Copy generated headers to include directory.
 			opendir(my $dh, 'src/backend/catalog/')
 			  || die "Can't opendir src/backend/catalog/ $!";
-			my @def_headers = grep { /pg_\w+_d\.h$/  } readdir($dh);
+			my @def_headers = grep { /pg_\w+_d\.h$/ } readdir($dh);
 			closedir $dh;
 			foreach my $def_header (@def_headers)
 			{
 				copyFile(
-				"src/backend/catalog/$def_header",
-				"src/include/catalog/$def_header");
+					"src/backend/catalog/$def_header",
+					"src/include/catalog/$def_header");
 			}
 			copyFile(
 				'src/backend/catalog/schemapg.h',
diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm
index 2f3480a1f60..3e29089bae5 100644
--- a/src/tools/msvc/VSObjectFactory.pm
+++ b/src/tools/msvc/VSObjectFactory.pm
@@ -53,8 +53,10 @@ sub CreateSolution
 	{
 		return new VS2015Solution(@_);
 	}
-	# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
-	elsif (($visualStudioVersion ge '14.10') or ($visualStudioVersion eq '15.00'))
+
+# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
+	elsif (($visualStudioVersion ge '14.10')
+		or ($visualStudioVersion eq '15.00'))
 	{
 		return new VS2017Solution(@_);
 	}
@@ -98,8 +100,10 @@ sub CreateProject
 	{
 		return new VC2015Project(@_);
 	}
-	# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
-	elsif (($visualStudioVersion ge '14.10') or ($visualStudioVersion eq '15.00'))
+
+# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
+	elsif (($visualStudioVersion ge '14.10')
+		or ($visualStudioVersion eq '15.00'))
 	{
 		return new VC2017Project(@_);
 	}
@@ -132,7 +136,8 @@ sub DetermineVisualStudioVersion
 sub _GetVisualStudioVersion
 {
 	my ($major, $minor) = @_;
-	# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
+
+# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
 	if ($major > 14)
 	{
 		carp
diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl
index 9b5bc081e16..806f1576c54 100644
--- a/src/tools/msvc/gendef.pl
+++ b/src/tools/msvc/gendef.pl
@@ -155,8 +155,8 @@ sub usage
 
 usage()
   unless scalar(@ARGV) == 2
-	  && (   ($ARGV[0] =~ /\\([^\\]+$)/)
-		  && ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64'));
+  && ( ($ARGV[0] =~ /\\([^\\]+$)/)
+	&& ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64'));
 my $defname  = uc $1;
 my $deffile  = "$ARGV[0]/$defname.def";
 my $platform = $ARGV[1];
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 2d6b67cedfb..6838397948f 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -254,13 +254,16 @@ sub plcheck
 	{
 		next unless -d "$dir/sql" && -d "$dir/expected";
 		my $lang;
-		if ($dir eq 'plpgsql/src') {
+		if ($dir eq 'plpgsql/src')
+		{
 			$lang = 'plpgsql';
 		}
-		elsif ($dir eq 'tcl') {
+		elsif ($dir eq 'tcl')
+		{
 			$lang = 'pltcl';
 		}
-		else {
+		else
+		{
 			$lang = $dir;
 		}
 		if ($lang eq 'plpython')
diff --git a/src/tools/pginclude/pgcheckdefines b/src/tools/pginclude/pgcheckdefines
index aa7c9c2fc13..dd12feeca22 100755
--- a/src/tools/pginclude/pgcheckdefines
+++ b/src/tools/pginclude/pgcheckdefines
@@ -58,7 +58,7 @@ while (<$pipe>)
 	chomp;
 	push @hfiles, $_
 	  unless m|^src/include/port/|
-		  || m|^src/backend/port/\w+/|;
+	  || m|^src/backend/port/\w+/|;
 }
 close $pipe or die "$FIND failed: $!";
 
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 06a38261c6b..2bbbd7b8506 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -59,9 +59,8 @@ $excludes ||= "$code_base/src/tools/pgindent/exclude_file_patterns"
 # easier to configure.  Note that the typedefs need trailing newlines.
 my @whitelist = ("bool\n");
 
-my %blacklist = map { +"$_\n" => 1 }
-  qw( FD_SET date interval timestamp ANY
-      abs allocfunc iterator other pointer printfunc reference string type );
+my %blacklist = map { +"$_\n" => 1 } qw( FD_SET date interval timestamp ANY
+  abs allocfunc iterator other pointer printfunc reference string type );
 
 # globals
 my @files;
@@ -135,7 +134,7 @@ sub load_typedefs
 	push(@typedefs, @whitelist);
 
 	# remove blacklisted entries
-	@typedefs = grep { ! $blacklist{$_} } @typedefs;
+	@typedefs = grep { !$blacklist{$_} } @typedefs;
 
 	# write filtered typedefs
 	my $filter_typedefs_fh = new File::Temp(TEMPLATE => "pgtypedefXXXXX");
@@ -394,7 +393,7 @@ File::Find::find(
 			  && -f _
 			  && /^.*\.[ch]\z/s
 			  && push(@files, $File::Find::name);
-		  }
+		}
 	},
 	$code_base) if $code_base;
 
-- 
cgit v1.2.3