diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
| commit | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /asn1/mpeg-pes | |
| parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) | |
| download | wireshark-0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1.tar.gz | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'asn1/mpeg-pes')
| -rw-r--r-- | asn1/mpeg-pes/packet-mpeg-pes-template.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 23271106fc..714adadf11 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -311,8 +311,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (prefix != PES_PREFIX) return FALSE; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); stream = tvb_get_guint8(tvb, 3); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -466,8 +465,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE); } |