diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
commit | d9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch) | |
tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-cmp.c | |
parent | 761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff) |
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cmp.c')
-rw-r--r-- | epan/dissectors/packet-cmp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index c22ae6dbc0..a18960facc 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1508,8 +1508,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -1680,8 +1679,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); |