diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
commit | 23319ff023bcb144347a1307b958359b5226c699 (patch) | |
tree | b347f1669210e07039ec31051cbb2c5e82422e6b /packet-h261.c | |
parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) |
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
Diffstat (limited to 'packet-h261.c')
-rw-r--r-- | packet-h261.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-h261.c b/packet-h261.c index 453159b341..87724c566c 100644 --- a/packet-h261.c +++ b/packet-h261.c @@ -2,7 +2,7 @@ * * Routines for ITU-T Recommendation H.261 dissection * - * $Id: packet-h261.c,v 1.9 2001/07/16 05:16:57 guy Exp $ + * $Id: packet-h261.c,v 1.10 2001/12/10 00:25:28 guy Exp $ * * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema <andreas.sikkema@philips.com> @@ -75,12 +75,12 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree *h261_tree = NULL; unsigned int offset = 0; - if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { - col_set_str( pinfo->fd, COL_PROTOCOL, "H.261" ); + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { + col_set_str( pinfo->cinfo, COL_PROTOCOL, "H.261" ); } - if ( check_col( pinfo->fd, COL_INFO) ) { - col_set_str( pinfo->fd, COL_INFO, "H.261 message"); + if ( check_col( pinfo->cinfo, COL_INFO) ) { + col_set_str( pinfo->cinfo, COL_INFO, "H.261 message"); } if ( tree ) { |