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.


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

1 files changed, 15 insertions, 18 deletions

diff --git a/epan/frame_data.h b/epan/frame_data.h
index 75e216b6c8..8999586d92 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,12 +1,11 @@
 /* frame_data.h
  * Definitions for frame_data structures and routines
  *
- * $Id: frame_data.h,v 1.1 2001/04/01 04:11:50 hagbard Exp $
+ * $Id: frame_data.h,v 1.2 2001/12/10 00:26:16 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -28,27 +27,25 @@
 
 #include "column_info.h"
 
-
 /* XXX - some of this stuff is used only while a packet is being dissected;
    should we keep that stuff in the "packet_info" structure, instead, to
    save memory? */
 typedef struct _frame_data {
   struct _frame_data *next; /* Next element in list */
   struct _frame_data *prev; /* Previous element in list */
-  GSList *pfd;              /* Per frame proto data */
-  GSList *data_src;         /* Frame data sources */
-  guint32      num;       /* Frame number */
-  guint32      pkt_len;   /* Packet length */
-  guint32      cap_len;   /* Amount actually captured */
-  gint32       rel_secs;  /* Relative seconds (yes, it can be negative) */
-  gint32       rel_usecs; /* Relative microseconds (yes, it can be negative) */
-  guint32      abs_secs;  /* Absolute seconds */
-  guint32      abs_usecs; /* Absolute microseconds */
-  gint32       del_secs;  /* Delta seconds (yes, it can be negative) */
-  gint32       del_usecs; /* Delta microseconds (yes, it can be negative) */
-  long         file_off;  /* File offset */
-  column_info *cinfo;     /* Column formatting information */
-  int          lnk_t;     /* Per-packet encapsulation/data-link type */
+  GSList      *pfd;         /* Per frame proto data */
+  GSList      *data_src;    /* Frame data sources */
+  guint32      num;         /* Frame number */
+  guint32      pkt_len;     /* Packet length */
+  guint32      cap_len;     /* Amount actually captured */
+  gint32       rel_secs;    /* Relative seconds (yes, it can be negative) */
+  gint32       rel_usecs;   /* Relative microseconds (yes, it can be negative) */
+  guint32      abs_secs;    /* Absolute seconds */
+  guint32      abs_usecs;   /* Absolute microseconds */
+  gint32       del_secs;    /* Delta seconds (yes, it can be negative) */
+  gint32       del_usecs;   /* Delta microseconds (yes, it can be negative) */
+  long         file_off;    /* File offset */
+  int          lnk_t;       /* Per-packet encapsulation/data-link type */
   struct {
 	unsigned int passed_dfilter	: 1; /* 1 = display, 0 = no display */
   	unsigned int encoding		: 2; /* Character encoding (ASCII, EBCDIC...) */