Guard fdata->col_text_len/fdata->col_text with NEW_PACKET_LIST

svn path=/trunk/; revision=30044

epan/frame_data.c

@@ -60,7 +60,6 @@ static gint p_compare(gconstpointer a, gconstpointer b)
 
 }
 
-
 void
 p_add_proto_data(frame_data *fd, int proto, void *proto_data)
 {
@@ -217,6 +216,10 @@ frame_data_init(frame_data *fdata, guint32 num,
   fdata->flags.marked = 0;
   fdata->flags.ref_time = 0;
   fdata->color_filter = NULL;
+#ifdef NEW_PACKET_LIST
+  fdata->col_text_len = NULL;
+  fdata->col_text = NULL;
+#endif
 
   /* If we don't have the time stamp of the first packet in the
      capture, it's because this is the first packet.  Save the time

epan/frame_data.h

@@ -25,14 +25,14 @@
 #ifndef __FRAME_DATA_H__
 #define __FRAME_DATA_H__
 
-#include "column_info.h"
-#include "tvbuff.h"
+#include <epan/column_info.h>
+#include <epan/tvbuff.h>
 #include <epan/nstime.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? */
+
 /* The frame number is the ordinal number of the frame in the capture, so
    it's 1-origin.  In various contexts, 0 as a frame number means "frame
    number unknown". */
@@ -61,8 +61,10 @@ typedef struct _frame_data {
   nstime_t     del_dis_ts;  /* Delta timestamp to previous displayed frame (yes, it can be negative) */
   nstime_t     del_cap_ts;  /* Delta timestamp to previous captured frame (yes, it can be negative) */
 
+#ifdef NEW_PACKET_LIST
   gchar        **col_text;    /* The column text for some columns, see colum_utils */
   guint        *col_text_len; /* The length of the column text strings in 'col_text' */
+#endif
 } frame_data;
 
 /*