catapult: use ws_strtou/i functions.

[metze/wireshark/wip.git] / wiretap / netscreen.h

diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h
index f048520c2916d7f4761f4b45f3461775a916ddc0..b3b84135947bb3eee56050ec43e5bcd0cf467e17 100644 (file)
--- a/wiretap/netscreen.h
+++ b/wiretap/netscreen.h
@@ -1,6 +1,4 @@
 /* netscreen.h
- *
- * $Id$
  *
  * Juniper NetScreen snoop output parser
  * Created by re-using a lot of code from cosine.c
@@ -29,7 +27,7 @@
 #define __W_NETSCREEN_H__
 
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 
 /* Magic text to check for NetScreen snoop output */
 #define NETSCREEN_HDR_MAGIC_STR1       "(i) len="
@@ -39,7 +37,7 @@
 #define NETSCREEN_REC_MAGIC_STR1       NETSCREEN_HDR_MAGIC_STR1
 #define NETSCREEN_REC_MAGIC_STR2       NETSCREEN_HDR_MAGIC_STR2
 
-#define NETSCREEN_LINE_LENGTH          128
+#define NETSCREEN_LINE_LENGTH          128
 #define NETSCREEN_HEADER_LINES_TO_CHECK        32
 #define NETSCREEN_MAX_INFOLINES                8
 #define NETSCREEN_SPACES_ON_INFO_LINE  14
@@ -48,10 +46,6 @@
 #define NETSCREEN_INGRESS              FALSE
 #define NETSCREEN_EGRESS               TRUE
 
-
-#define NETSCREEN_MAX_PACKET_LEN       65536
-
-WS_DLL_LOCAL
-int netscreen_open(wtap *wth, int *err, gchar **err_info);
+wtap_open_return_val netscreen_open(wtap *wth, int *err, gchar **err_info);
 
 #endif