gcc44 warns: Put input() under YY_NO_INPUT and set that if it isn't used.

diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index e57fb7c..3eeddad 100644 (file)
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -54,6 +54,7 @@ int yylex(void);
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
        result = (*buf = *arith_buf++) ? 1 : YY_NULL;
+#define YY_NO_INPUT
 #define YY_NO_UNPUT
 %}
 

diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index c477684..f2d0d80 100644 (file)
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -64,6 +64,7 @@ static inline int xdtoi(int);
 
 #ifdef FLEX_SCANNER
 #define YY_NO_UNPUT
+#define YY_NO_INPUT
 static YY_BUFFER_STATE in_buffer;
 #else
 static char *in_buffer;

diff --git a/games/atc/lex.l b/games/atc/lex.l
index 67b4e85..a307b9d 100644 (file)
--- a/games/atc/lex.l
+++ b/games/atc/lex.l
@@ -49,6 +49,7 @@
 
 #include       "y.tab.h"
 
+#define                YY_NO_INPUT
 #define                YY_NO_UNPUT
 extern int     line;
 extern int     yylex(void);

diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
index 1043448..f51607d 100644 (file)
--- a/lib/libipsec/policy_token.l
+++ b/lib/libipsec/policy_token.l
@@ -47,6 +47,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#define YY_NO_INPUT
+
 #ifndef __NetBSD__
 #include "y.tab.h"
 #else

diff --git a/libexec/dma/aliases_scan.l b/libexec/dma/aliases_scan.l
index b68e092..5e6bdd5 100644 (file)
--- a/libexec/dma/aliases_scan.l
+++ b/libexec/dma/aliases_scan.l
@@ -3,6 +3,8 @@
 #include <string.h>
 #include "aliases_parse.h"
 
+#define YY_NO_INPUT
+
 int yylex(void);
 %}
 

diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l
index 52e585d..5bc1a17 100644 (file)
--- a/usr.bin/bc/scan.l
+++ b/usr.bin/bc/scan.l
@@ -31,6 +31,8 @@
 #include "pathnames.h"
 #include "y.tab.h"
 
+#define YY_NO_INPUT
+
 int            lineno;
 bool           interactive;
 

diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 64b2256..a12e56b 100644 (file)
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -39,6 +39,8 @@
 #include "common.h"
 #include "y.tab.h"
 
+#define YY_NO_INPUT
+
 int line_no = 1, save_no, fromsubs;
 static u_char buffer[BUFSIZE], *buf_ptr;
 FILE *map_fp;

diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index aff70d8..9881a8b 100644 (file)
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -977,6 +977,7 @@ void yyFlexLexer::yyunput( int c, char* yy_bp )
 
 
 %-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1056,6 +1057,9 @@ int yyFlexLexer::yyinput()
 
        return c;
        }
+%-
+#endif /* ifndef YY_NO_INPUT */
+%*
 
 
 %-

diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 938135c..baf0189 100644 (file)
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -41,6 +41,7 @@
 #include "y.tab.h"
 #include "config.h"
 
+#define YY_NO_INPUT
 #define YY_NO_UNPUT
 
 /*

diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index e244b2e..719db00 100644 (file)
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -43,6 +43,7 @@
 #include "y.tab.h"
 
 int lineno = 1;
+#define YY_NO_INPUT
 #define YY_NO_UNPUT
 
 int yylex(void);

diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 6c032b2..307b1f6 100644 (file)
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -33,6 +33,7 @@
  */
 
 %{
+#define YY_NO_INPUT
 #define YY_NO_UNPUT
 
 #include <sys/param.h>

diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l
index 27d9e8a..a0f7865 100644 (file)
--- a/usr.sbin/setkey/token.l
+++ b/usr.sbin/setkey/token.l
@@ -69,6 +69,8 @@
 
 #define PREPROC        DECHO CMDARG
 
+#define YY_NO_INPUT
+
 int lineno = 1;
 char cmdarg[8192]; /* XXX: BUFSIZ is the better ? */