From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 19 Feb 2017 21:41:51 +0000 (-0500)
Subject: Dept of second thoughts: rename new perl script.
X-Git-Tag: REL_10_BETA1~866
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b3a2ca850718e1fd74f26bc2886e880676b2cd6;p=postgresql

Dept of second thoughts: rename new perl script.

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
index 35c8cb826e..831d39a9d1 100644
--- 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-flex-warning.pl b/src/tools/fix-old-flex-code.pl
similarity index 91%
rename from src/tools/fix-flex-warning.pl
rename to src/tools/fix-old-flex-code.pl
index 14df02198f..8dafcae15e 100644
--- a/src/tools/fix-flex-warning.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 @@ exit 0;
 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
index d590155f10..fab0efa79f 100644
--- a/src/tools/msvc/pgflex.pl
+++ b/src/tools/msvc/pgflex.pl
@@ -60,7 +60,7 @@ if ($? == 0)
 	{
 		# 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
 	{