Use noyywrap rather than supplying a yywrap() that just returns 1.

We require a version of Flex that supports it.

That avoids having to change the signature of yywrap().

1 files changed, 9 insertions, 10 deletions

diff --git a/scanner.l b/scanner.l
index 451f86b4..1590926d 100644
--- a/scanner.l
+++ b/scanner.l
@@ -25,6 +25,15 @@
  */
 %option never-interactive
 
+/*
+ * We want to stop processing when we get to the end of the input.
+ */
+%option noyywrap
+
+/*
+ * We want to generate code that can be used by a reentrant parser
+ * generated by Bison or Berkeley YACC.
+ */
 %option bison-bridge
 
 %{
@@ -429,16 +438,6 @@ tcp-urg			{ yylval->i = 0x20; return NUM; }
 .			{ bpf_error("illegal char '%c'", *yytext); }
 %%
 
-/*
- * Also define a yywrap.  Note that if we're using flex, it will
- * define a macro to map this identifier to pcap_wrap.
- */
-int
-yywrap()
-{
-	return 1;
-}
-
 /* Hex digit to integer. */
 static inline int
 xdtoi(c)