From b2e9a22ec53becba2c23777ffee4ff375d135698 Mon Sep 17 00:00:00 2001 From: krj Date: Sun, 9 Aug 2009 07:36:13 +0000 Subject: Don't guard col_clear with col_check git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-chdlc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-chdlc.c') diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index c4cfdedf89..6991f02cc0 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -164,8 +164,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 proto; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { @@ -272,8 +271,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 yoursequence; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); code = tvb_get_ntohl(tvb, 0); -- cgit v1.2.3