Declare "proto_malformed" in "packet-frame.h", as "packet-frame.c"

exports it.

Make the pointer that points to the GMemChunk for per-frame data static
to "epan/packet.c", as it's not used outside "epan/packet.c".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2741 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/packet.c b/epan/packet.c
index 21479f2dcd3111c9c27381020dad8218bf706e10..e3691c908e96ffbce5385941cac18d7b6abae022 100644 (file)
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.9 2000/12/03 22:26:26 guy Exp $
+ * $Id: packet.c,v 1.10 2000/12/03 22:32:10 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -83,9 +83,6 @@
 #include "tvbuff.h"
 #include "plugins.h"
 
-extern int proto_malformed;
-
-
 static void display_signed_time(gchar *, int, gint32, gint32);
 
 
@@ -97,7 +94,7 @@ typedef struct _frame_proto_data {
   void *proto_data;
 } frame_proto_data;
 
-GMemChunk *frame_proto_data_area = NULL;
+static GMemChunk *frame_proto_data_area = NULL;
 
 
 /* 

diff --git a/packet-frame.h b/packet-frame.h
index 62ed6584a91f102a98d2786adc06239a3f46235d..b1f7517adbc5d4534781df17c62fab5ed8c9d90d 100644 (file)
--- a/packet-frame.h
+++ b/packet-frame.h
@@ -2,7 +2,7 @@
  *
  * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
  *
- * $Id: packet-frame.h,v 1.1 2000/10/06 10:10:49 gram Exp $
+ * $Id: packet-frame.h,v 1.2 2000/12/03 22:32:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,3 +26,6 @@
 
 void
 dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+/* "Protocol" used for "malformed frame" errors */
+extern int proto_malformed;