HTTP2: allow subdissectors to query the Stream ID

[metze/wireshark/wip.git] / text2pcap-scanner.l

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 2b9e6dbab8b72e536506b8bb9857c0606d7406a9..f1ef1241fb363cfb7be74992608298001a672520 100644 (file)
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -45,19 +45,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  *******************************************************************************/
 
@@ -66,7 +54,10 @@
 
 #include "text2pcap.h"
 
-DIAG_OFF(sign-compare)
+/*
+ * Disable diagnostics in the code generated by Flex.
+ */
+DIAG_OFF_FLEX
 
 /*
  * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
@@ -75,12 +66,6 @@ DIAG_OFF(sign-compare)
 #define YY_NO_UNISTD_H
 #endif
 
-#ifdef _WIN32
-/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
-/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
-#pragma warning (disable:4018)
-#endif
-
 %}
 
 hexdigit [0-9A-Fa-f]
@@ -109,3 +94,20 @@ eol \r?\n\r?
        if (parse_token(T_EOL, NULL) != EXIT_SUCCESS) return EXIT_FAILURE; }
 {comment}         { if (parse_token(T_EOL, NULL) != EXIT_SUCCESS) return EXIT_FAILURE; }
 {text}            { if (parse_token(T_TEXT, yytext) != EXIT_SUCCESS) return EXIT_FAILURE; }
+
+%%
+
+/*
+ * Turn diagnostics back on, so we check the code that we've written.
+ */
+DIAG_ON_FLEX
+
+int
+text2pcap_scan(void)
+{
+    int ret;
+
+    ret = text2pcap_lex();
+    text2pcap_lex_destroy();
+    return ret;
+}