From 23319ff023bcb144347a1307b958359b5226c699 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 10 Dec 2001 00:26:21 +0000 Subject: 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 --- packet-prism.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'packet-prism.c') diff --git a/packet-prism.c b/packet-prism.c index 4fc9885f70..a3ef4907cb 100644 --- a/packet-prism.c +++ b/packet-prism.c @@ -9,7 +9,7 @@ * * By Tim Newsham * - * $Id: packet-prism.c,v 1.4 2001/12/03 03:59:38 guy Exp $ + * $Id: packet-prism.c,v 1.5 2001/12/10 00:25:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -124,16 +124,16 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; int offset; - if(check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "Prism"); - if(check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if(check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism"); + if(check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); offset = 0; tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof hdr); - if(check_col(pinfo->fd, COL_INFO)) - col_add_fstr(pinfo->fd, COL_INFO, "Device: %.16s " + if(check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %.16s " "Message 0x%x, Length %d", hdr.devname, hdr.msgcode, hdr.msglen); -- cgit v1.2.3