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 /epan/dissectors/packet-kpasswd.c | |
parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-kpasswd.c')
-rw-r--r-- | epan/dissectors/packet-kpasswd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 6e59d17ec6..3a7b57690a 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -203,8 +203,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo gint krb_rm_size = 0; /* bytes consumed by record mark: 0 or 4 */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); /* can't pass have_rm to dissect_kerberos_main, so strip rm first */ if (have_rm) { @@ -287,8 +286,7 @@ static void dissect_kpasswd_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); tcp_dissect_pdus(tvb, pinfo, tree, kpasswd_desegment, 4, get_krb_pdu_len, dissect_kpasswd_tcp_pdu); |