From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes

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

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index ed81b23c8f27a3f668489af151689d39afac0d75..ca9926d1350e177b4fe1ace55f92cfba07f8a924 100644 (file)
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -6,7 +6,7 @@
 %option nounput
 
 %{
-    
+
 /********************************************************************************
  *
  * text2pcap-scanner.l
@@ -16,27 +16,27 @@
  * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  *
  * $Id$
- * 
+ *
  * Wireshark - Network traffic analyzer
  * 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.
  *
  *******************************************************************************/
-    
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -47,7 +47,7 @@
  */
 #ifdef _WIN32
 #define YY_NO_UNISTD_H
-#endif    
+#endif
 
 #ifdef _WIN32
 /* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
@@ -61,9 +61,9 @@ hexdigit [0-9A-Fa-f]
 directive #TEXT2PCAP.*
 comment #[^W].*
 byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
-byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
+byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n
 offset [0-9A-Fa-f]+[: \t]
-offset_eol [0-9A-Fa-f]+\n
+offset_eol [0-9A-Fa-f]+\r?\n
 text [^ \n\t]+
 mailfwd >
 eol \r?\n\r?
@@ -83,7 +83,7 @@ eol \r?\n\r?
 
 %%
 
-int yywrap()
+int yywrap(void)
 {
     return 1;
 }