Dept of second thoughts: rename new perl script.

tglsfdc · tglsfdc · commit 5b3a2ca85071 · 2017-02-19T16:41:51.000-05:00
It didn't take long at all for me to become irritated that the original
choice of name for this script resulted in "warning" showing up in several
places in build logs, because I tend to grep for that.  Change the script
name to avoid that.
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -627,7 +627,7 @@ TAS         = @TAS@
 ifdef FLEX
 	$(FLEX) $(if $(FLEX_NO_BACKUP),-b) $(FLEXFLAGS) -o'$@' $<
 	@$(if $(FLEX_NO_BACKUP),if [ `wc -l <lex.backup` -eq 1 ]; then rm lex.backup; else echo "Scanner requires backup; see lex.backup." 1>&2; exit 1; fi)
-	$(if $(FLEX_FIX_WARNING),$(PERL) $(top_srcdir)/src/tools/fix-flex-warning.pl '$@')
+	$(if $(FLEX_FIX_WARNING),$(PERL) $(top_srcdir)/src/tools/fix-old-flex-code.pl '$@')
 else
 	@$(missing) flex $< '$@'
 endif
diff --git a/src/tools/fix-old-flex-code.pl b/src/tools/fix-old-flex-code.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 #----------------------------------------------------------------------
 #
-# fix-flex-warning.pl
+# fix-old-flex-code.pl
 #
 # flex versions before 2.5.36, with certain option combinations, produce
 # code that causes an "unused variable" warning.  That's annoying, so
@@ -11,7 +11,7 @@
 # Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# src/tools/fix-flex-warning.pl
+# src/tools/fix-old-flex-code.pl
 #
 #----------------------------------------------------------------------
 
@@ -55,9 +55,9 @@
 sub usage
 {
 	die <<EOM;
-Usage: fix-flex-warning.pl c-file-name
+Usage: fix-old-flex-code.pl c-file-name
 
-fix-flex-warning.pl modifies a flex output file to suppress
+fix-old-flex-code.pl modifies a flex output file to suppress
 an unused-variable warning that occurs with older flex versions.
 
 Report bugs to <pgsql-bugs\@postgresql.org>.
diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
@@ -60,7 +60,7 @@
 	{
 		# Reentrant scanners usually need a fix to prevent
 		# "unused variable" warnings with older flex versions.
-		system("perl src\\tools\\fix-flex-warning.pl $output");
+		system("perl src\\tools\\fix-old-flex-code.pl $output");
 	}
 	else
 	{
