From 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Sun, 9 Aug 2009 07:36:13 +0000 Subject: Don't guard col_clear with col_check svn path=/trunk/; revision=29344 --- epan/dissectors/packet-pim.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-pim.c') diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 6a6591b742..2991b04024 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -115,8 +115,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIMv1"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if (tree) { ti = proto_tree_add_item(tree, proto_pim, tvb, offset, -1, FALSE); @@ -610,8 +609,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *tiopt; col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIM"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); pim_typever = tvb_get_guint8(tvb, 0); -- cgit v1.2.3