Move the pointer to the "column_info" structure in the "frame_data"

structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.

That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.

svn path=/trunk/; revision=4370

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/epan.h b/epan/epan.h
index 7741a2598f..d2e786cd85 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -1,6 +1,6 @@
 /* epan.h
  *
- * $Id: epan.h,v 1.9 2001/12/06 04:25:08 gram Exp $
+ * $Id: epan.h,v 1.10 2001/12/10 00:26:16 guy Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
@@ -51,12 +51,12 @@ epan_free(epan_t*);
 typedef struct _epan_dissect_t {
 	tvbuff_t	*tvb;
 	proto_tree	*tree;
-    packet_info pi;
+	packet_info	pi;
 } epan_dissect_t;
 
 epan_dissect_t*
 epan_dissect_new(void* pseudo_header, const guint8* data, frame_data *fd,
-		gboolean create_proto_tree);
+		gboolean create_proto_tree, column_info *cinfo);
 
 void
 epan_dissect_free(epan_dissect_t* edt);