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-mpeg1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packet-mpeg1.c') diff --git a/packet-mpeg1.c b/packet-mpeg1.c index 3aaf8eabd1..6f6bedc561 100644 --- a/packet-mpeg1.c +++ b/packet-mpeg1.c @@ -2,7 +2,7 @@ * * Routines for RFC 2250 MPEG-1 dissection * - * $Id: packet-mpeg1.c,v 1.3 2001/07/16 05:16:57 guy Exp $ + * $Id: packet-mpeg1.c,v 1.4 2001/12/10 00:25:30 guy Exp $ * * Copyright 2001, * Francisco Javier Cabello Torres, @@ -133,14 +133,14 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint16 mpg_ffv; guint16 mpg_ffc; - if ( check_col( pinfo->fd, COL_PROTOCOL ) ) + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->fd, COL_PROTOCOL, "MPEG-1" ); + col_set_str( pinfo->cinfo, COL_PROTOCOL, "MPEG-1" ); } - if ( check_col( pinfo->fd, COL_INFO) ) + if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_set_str( pinfo->fd, COL_INFO, "MPEG-1 message"); + col_set_str( pinfo->cinfo, COL_INFO, "MPEG-1 message"); } /* Get MPEG-1 fields */ -- cgit v1.2.3