Perl scripts: eliminate "Useless interpolation" warnings

bmomjian · bmomjian · commit 43ce181059d4 · 2024-09-15T10:55:37.000-04:00
Eliminate warnings of Perl Critic from src/tools.

Backpatch-through: master
diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
@@ -44,7 +44,7 @@ sub wanted
 	return if ($_ =~ m/\.(ico|bin|po|key)$/);
 
 	my @lines;
-	tie @lines, "Tie::File", $File::Find::name;
+	tie @lines, 'Tie::File', $File::Find::name;
 
 	# We process all lines because some files have copyright
 	# strings embedded in them, e.g. src/bin/psql/help.c
diff --git a/src/tools/gen_export.pl b/src/tools/gen_export.pl
@@ -14,7 +14,7 @@
 	'format:s' => \$format,
 	'libname:s' => \$libname,
 	'input:s' => \$input,
-	'output:s' => \$output) or die "wrong arguments";
+	'output:s' => \$output) or die 'wrong arguments';
 
 if (not(   $format eq 'darwin'
 		or $format eq 'gnu'
@@ -32,9 +32,9 @@
 
 if ($format eq 'gnu')
 {
-	print $output_handle "{
+	print $output_handle '{
   global:
-";
+';
 }
 elsif ($format eq 'win')
 {
@@ -76,7 +76,7 @@
 
 if ($format eq 'gnu')
 {
-	print $output_handle "  local: *;
+	print $output_handle '  local: *;
 };
-";
+';
 }
diff --git a/src/tools/gen_keywordlist.pl b/src/tools/gen_keywordlist.pl
@@ -160,7 +160,7 @@
 
 # Emit the definition of the hash function.
 
-my $funcname = $varname . "_hash_func";
+my $funcname = $varname . '_hash_func';
 
 my $f = PerfectHash::generate_hash_function(\@keywords, $funcname,
 	case_fold => $case_fold);
@@ -169,7 +169,7 @@
 
 # Emit the struct that wraps all this lookup info into one variable.
 
-printf $kwdef "static " if !$extern;
+printf $kwdef 'static ' if !$extern;
 printf $kwdef "const ScanKeywordList %s = {\n", $varname;
 printf $kwdef qq|\t%s_kw_string,\n|, $varname;
 printf $kwdef qq|\t%s_kw_offsets,\n|, $varname;
diff --git a/src/tools/msvc_gendef.pl b/src/tools/msvc_gendef.pl
@@ -72,10 +72,10 @@ sub extract_syms
 		next unless $pieces[6];
 
 		# Skip externs used from another compilation unit
-		next if ($pieces[2] eq "UNDEF");
+		next if ($pieces[2] eq 'UNDEF');
 
 		# Skip static symbols
-		next unless ($pieces[4] eq "External");
+		next unless ($pieces[4] eq 'External');
 
 		# Skip some more MSVC-generated crud
 		next if $pieces[6] =~ /^@/;
@@ -120,7 +120,7 @@ sub writedef
 
 		# Strip the leading underscore for win32, but not x64
 		$f =~ s/^_//
-		  unless ($arch eq "x86_64");
+		  unless ($arch eq 'x86_64');
 
 		# Emit just the name if it's a function symbol, or emit the name
 		# decorated with the DATA option for variables.
@@ -193,11 +193,11 @@ sub usage
 
 my $cmd = "dumpbin /nologo /symbols /out:$tmpfile " . join(' ', @files);
 
-system($cmd) == 0 or die "Could not call dumpbin";
+system($cmd) == 0 or die 'Could not call dumpbin';
 rename($tmpfile, $symfile) or die $!;
 extract_syms($symfile, \%def);
 print "\n";
 
 writedef($deffile, $arch, \%def);
 
-print "Generated " . scalar(keys(%def)) . " symbols\n";
+print 'Generated ' . scalar(keys(%def)) . " symbols\n";
diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
@@ -37,7 +37,7 @@
 {
 	$dotneeded = 1;
 }
-elsif ($minor eq "devel")
+elsif ($minor eq 'devel')
 {
 	$dotneeded = 0;
 }
@@ -63,7 +63,7 @@
 # Create various required forms of the version number
 if ($dotneeded)
 {
-	$fullversion = $majorversion . "." . $minor;
+	$fullversion = $majorversion . '.' . $minor;
 }
 else
 {
@@ -73,8 +73,8 @@
 # Get the autoconf version number for eventual nag message
 # (this also ensures we're in the right directory)
 
-my $aconfver = "";
-open(my $fh, '<', "configure.ac") || die "could not read configure.ac: $!\n";
+my $aconfver = '';
+open(my $fh, '<', 'configure.ac') || die "could not read configure.ac: $!\n";
 while (<$fh>)
 {
 	if (m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/
@@ -85,17 +85,17 @@
 	}
 }
 close($fh);
-$aconfver ne ""
+$aconfver ne ''
   || die "could not find autoconf version number in configure.ac\n";
 
 # Update configure.ac and other files that contain version numbers
 
-my $fixedfiles = "";
+my $fixedfiles = '';
 
-sed_file("configure.ac",
+sed_file('configure.ac',
 	"-e 's/AC_INIT(\\[PostgreSQL\\], \\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'"
 );
-sed_file("meson.build",
+sed_file('meson.build',
 	qq{-e "/^project(/,/^)/ s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
 );
 
@@ -107,7 +107,7 @@
 sub sed_file
 {
 	my ($filename, $sedargs) = @_;
-	my ($tmpfilename) = $filename . ".tmp";
+	my ($tmpfilename) = $filename . '.tmp';
 
 	system("sed $sedargs $filename >$tmpfilename") == 0
 	  or die "sed failed: $?";
diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl
@@ -38,7 +38,7 @@ BEGIN
 #
 my $basekey;
 $HKEY_LOCAL_MACHINE->Open(
-	"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", $basekey)
+	'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones', $basekey)
   or die $!;
 
 my @subkeys;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`'format:s' => \$format,`
`15`	`15`	`'libname:s' => \$libname,`
`16`	`16`	`'input:s' => \$input,`
`17`		`- 'output:s' => \$output) or die "wrong arguments";`
	`17`	`+ 'output:s' => \$output) or die 'wrong arguments';`
`18`	`18`
`19`	`19`	`if (not( $format eq 'darwin'`
`20`	`20`	`or $format eq 'gnu'`
`@@ -32,9 +32,9 @@`
`32`	`32`
`33`	`33`	`if ($format eq 'gnu')`
`34`	`34`	`{`
`35`		`- print $output_handle "{`
	`35`	`+ print $output_handle '{`
`36`	`36`	`global:`
`37`		`-";`
	`37`	`+';`
`38`	`38`	`}`
`39`	`39`	`elsif ($format eq 'win')`
`40`	`40`	`{`
`@@ -76,7 +76,7 @@`
`76`	`76`
`77`	`77`	`if ($format eq 'gnu')`
`78`	`78`	`{`
`79`		`- print $output_handle " local: *;`
	`79`	`+ print $output_handle ' local: *;`
`80`	`80`	`};`
`81`		`-";`
	`81`	`+';`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`{`
`38`	`38`	`$dotneeded = 1;`
`39`	`39`	`}`
`40`		`-elsif ($minor eq "devel")`
	`40`	`+elsif ($minor eq 'devel')`
`41`	`41`	`{`
`42`	`42`	`$dotneeded = 0;`
`43`	`43`	`}`
`@@ -63,7 +63,7 @@`
`63`	`63`	`# Create various required forms of the version number`
`64`	`64`	`if ($dotneeded)`
`65`	`65`	`{`
`66`		`- $fullversion = $majorversion . "." . $minor;`
	`66`	`+ $fullversion = $majorversion . '.' . $minor;`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`@@ -73,8 +73,8 @@`
`73`	`73`	`# Get the autoconf version number for eventual nag message`
`74`	`74`	`# (this also ensures we're in the right directory)`
`75`	`75`
`76`		`-my $aconfver = "";`
`77`		`-open(my $fh, '<', "configure.ac") \|\| die "could not read configure.ac: $!\n";`
	`76`	`+my $aconfver = '';`
	`77`	`+open(my $fh, '<', 'configure.ac') \|\| die "could not read configure.ac: $!\n";`
`78`	`78`	`while (<$fh>)`
`79`	`79`	`{`
`80`	`80`	`if (m/^m4_if\(m4_defn\(\[m4_PACKAGE_VERSION\]\), \[(.*)\], \[\], \[m4_fatal/`
`@@ -85,17 +85,17 @@`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`close($fh);`
`88`		`-$aconfver ne ""`
	`88`	`+$aconfver ne ''`
`89`	`89`	`\|\| die "could not find autoconf version number in configure.ac\n";`
`90`	`90`
`91`	`91`	`# Update configure.ac and other files that contain version numbers`
`92`	`92`
`93`		`-my $fixedfiles = "";`
	`93`	`+my $fixedfiles = '';`
`94`	`94`
`95`		`-sed_file("configure.ac",`
	`95`	`+sed_file('configure.ac',`
`96`	`96`	`"-e 's/AC_INIT(\\[PostgreSQL\\], \\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'"`
`97`	`97`	`);`
`98`		`-sed_file("meson.build",`
	`98`	`+sed_file('meson.build',`
`99`	`99`	`qq{-e "/^project(/,/^)/ s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}`
`100`	`100`	`);`
`101`	`101`
`@@ -107,7 +107,7 @@`
`107`	`107`	`sub sed_file`
`108`	`108`	`{`
`109`	`109`	`my ($filename, $sedargs) = @_;`
`110`		`- my ($tmpfilename) = $filename . ".tmp";`
	`110`	`+ my ($tmpfilename) = $filename . '.tmp';`
`111`	`111`
`112`	`112`	`system("sed $sedargs $filename >$tmpfilename") == 0`
`113`	`113`	`or die "sed failed: $?";`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ BEGIN`
`38`	`38`	`#`
`39`	`39`	`my $basekey;`
`40`	`40`	`$HKEY_LOCAL_MACHINE->Open(`
`41`		`- "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", $basekey)`
	`41`	`+ 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones', $basekey)`
`42`	`42`	`or die $!;`
`43`	`43`
`44`	`44`	`my @subkeys;`