diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-04 19:52:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-05 08:06:50 +0000 |
| commit | f51bad11d70b2548ed2cbf117b90bd9dbf1afedf (patch) | |
| tree | 9db789d73c4958c3a792c6b10abcbb746318bcd8 /ui/text_import_scanner.l | |
| parent | 42333aa353515ccbb68c6e74109cd34a34d1abe6 (diff) | |
| download | wireshark-f51bad11d70b2548ed2cbf117b90bd9dbf1afedf.tar.gz | |
Use noyywrap rather than defining our own yywrap functions.
Tweak lemonflex-tail.inc to fix an issue this reveals.
It appears that, at least on the buildbots, the Visual Studio compiler
no longer issues warnings for the code generated with %option noyywrap.
Change-Id: Id64d56f1ae8a79d0336488a4a50518da1f511497
Reviewed-on: https://code.wireshark.org/review/12433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/text_import_scanner.l')
| -rw-r--r-- | ui/text_import_scanner.l | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/text_import_scanner.l b/ui/text_import_scanner.l index 625cc050d1..23e6d24adb 100644 --- a/ui/text_import_scanner.l +++ b/ui/text_import_scanner.l @@ -11,6 +11,11 @@ %option never-interactive /* + * We want to stop processing when we get to the end of the input. + */ +%option noyywrap + +/* * Prefix scanner routines with "text_import" rather than "yy", so this scanner * can coexist with other scanners. */ @@ -92,9 +97,3 @@ eol \r?\n\r? {text} { parse_token(T_TEXT, yytext); } <<EOF>> { write_current_packet(); yyterminate(); } - -%% -int yywrap(void) -{ - return 1; -} |