From d35c56ed9f26631d050463cd61a7bdd51b358fa6 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 9 May 2008 15:36:31 +0000
Subject: [PATCH] Add "%option noinput" to the scanners to avoid compiler
warnings. GCC 4.3 began to realize that the input() function isn't used and
printed warnings.
---
src/backend/bootstrap/bootscanner.l | 3 ++-
src/backend/parser/scan.l | 3 ++-
src/backend/utils/misc/guc-file.l | 3 ++-
src/bin/psql/psqlscan.l | 3 ++-
src/interfaces/ecpg/preproc/pgc.l | 3 ++-
src/pl/plpgsql/src/scan.l | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 5eddeca52f1..ebcd9e99d57 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.45 2008/01/01 19:45:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.46 2008/05/09 15:36:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,6 +52,7 @@ static int yyline = 1; /* line number for error reporting */
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option nounput
%option noyywrap
%option prefix="boot_yy"
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index bb22a5f96c9..1608abb4d95 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -24,7 +24,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.143 2008/04/04 12:44:36 mha Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.144 2008/05/09 15:36:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -101,6 +101,7 @@ static unsigned char unescape_single_char(unsigned char c);
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option nounput
%option noyywrap
%option prefix="base_yy"
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 8380b4fa62a..3a1ee2db4ec 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
*
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.54 2008/05/04 21:13:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.55 2008/05/09 15:36:31 petere Exp $
*/
%{
@@ -59,6 +59,7 @@ static char *GUC_scanstr(const char *s);
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option nounput
%option noyywrap
%option prefix="GUC_yy"
diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 07c31aa36a7..b5f1149cdc4 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -33,7 +33,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.24 2008/05/02 09:27:51 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.25 2008/05/09 15:36:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -125,6 +125,7 @@ static void emit(const char *txt, int len);
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option nounput
%option noyywrap
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index bcfc1619499..18cdccc7e15 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.163 2008/02/17 18:14:29 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.164 2008/05/09 15:36:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -76,6 +76,7 @@ static struct _if_value
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option noyywrap
%option yylineno
diff --git a/src/pl/plpgsql/src/scan.l b/src/pl/plpgsql/src/scan.l
index 8de29117c5c..38bc8a9f98d 100644
--- a/src/pl/plpgsql/src/scan.l
+++ b/src/pl/plpgsql/src/scan.l
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.61 2008/04/01 03:51:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.62 2008/05/09 15:36:31 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,6 +47,7 @@ bool plpgsql_SpaceScanned = false;
%option 8bit
%option never-interactive
%option nodefault
+%option noinput
%option nounput
%option noyywrap
%option prefix="plpgsql_base_yy"
--
GitLab