De-camel-ize "Wireshark" in a few places.

[gd/wireshark/.git] / text2pcap-scanner.l

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index c233999d4de8e07f457b9bd9f659b54aafa291fa..3a69a83ba1d34f06773810c3df40826d076b1c81 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
  *
  *******************************************************************************/
 
@@ -80,10 +68,9 @@ DIAG_OFF_FLEX
 
 %}
 
-hexdigit [0-9A-Fa-f]
 directive ^#TEXT2PCAP.*\r?\n
 comment ^[\t ]*#.*\r?\n
-byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
+byte [0-9A-Fa-f][0-9A-Fa-f][ \t]?
 byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n
 offset [0-9A-Fa-f]+[: \t]
 offset_eol [0-9A-Fa-f]+\r?\n
@@ -113,3 +100,13 @@ eol \r?\n\r?
  * 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;
+}