diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /asn1/mpeg-audio | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'asn1/mpeg-audio')
| -rw-r--r-- | asn1/mpeg-audio/packet-mpeg-audio-template.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 1784e9bd09..7c0c115ae1 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -120,8 +120,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { asn1_ctx_t asn1_ctx; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree == NULL) @@ -134,8 +133,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); proto_tree_add_item(tree, hf_id3v2, tvb, |