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, 7 insertions, 7 deletions

diff --git a/packet-ranap.c b/packet-ranap.c
index 1d21bc040e..1766e45166 100644
--- a/packet-ranap.c
+++ b/packet-ranap.c
@@ -3,7 +3,7 @@
  * Based on 3GPP TS 25.413 V3.4.0
  * Copyright 2001, Martin Held <Martin.Held@icn.siemens.de>
  *
- * $Id: packet-ranap.c,v 1.8 2001/12/03 03:59:38 guy Exp $
+ * $Id: packet-ranap.c,v 1.9 2001/12/10 00:25:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -3996,8 +3996,8 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   
 
   /* make entry in the Protocol column on summary display */
-  if (check_col(pinfo->fd, COL_PROTOCOL)) 
-    col_set_str(pinfo->fd, COL_PROTOCOL, "RANAP");  
+  if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP");  
   
   /* extract header fields which are needed even if no tree exists */
   
@@ -4008,7 +4008,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   {
       /* extended choice */ 
       /* decoding is not supported */
-      col_append_str(pinfo->fd, COL_INFO, "RANAP-PDU Protocol extension present, dissection not supported");
+      col_append_str(pinfo->cinfo, COL_INFO, "RANAP-PDU Protocol extension present, dissection not supported");
       return;                           
   }      
   
@@ -4022,14 +4022,14 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   tmp_offset += 1;
     
   /* add Procedure Code to Info Column */			       
-  if (check_col(pinfo->fd, COL_INFO)) 
+  if (check_col(pinfo->cinfo, COL_INFO)) 
   {
     if (procedure_code <= PC_max)
     {
-       col_append_str(pinfo->fd, COL_INFO, 
+       col_append_str(pinfo->cinfo, COL_INFO, 
                    val_to_str(pdu_index, ranap_message_names[procedure_code], 
                               "unknown message"));
-       col_append_str(pinfo->fd, COL_INFO, " ");
+       col_append_str(pinfo->cinfo, COL_INFO, " ");
     }
   }