aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cpha.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:36:13 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:36:13 +0000
commitb2e9a22ec53becba2c23777ffee4ff375d135698 (patch)
tree794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-cpha.c
parentd629eac134867d997a496115fd1a04090f149fe7 (diff)
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cpha.c')
-rw-r--r--epan/dissectors/packet-cpha.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 58d904feb0..88009c5561 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -219,8 +219,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_clear(pinfo->cinfo, COL_INFO);
tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
hdr.magic_number = g_ntohs(hdr.magic_number);