aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-chdlc.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:36:13 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:36:13 +0000
commit0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch)
tree794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-chdlc.c
parent5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff)
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-chdlc.c')
-rw-r--r--epan/dissectors/packet-chdlc.c6
1 files changed, 2 insertions, 4 deletions
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);