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-atm.c | |
| parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 181f80b5bb..26885ba7b8 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1675,8 +1675,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AAL_1: col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, FALSE); aal_tree = proto_item_add_subtree(ti, ett_aal1); octet = tvb_get_guint8(tvb, offset); @@ -1701,8 +1700,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * XXX - or should this be the CS PDU? */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, FALSE); aal_tree = proto_item_add_subtree(ti, ett_aal3_4); aal3_4_hdr = tvb_get_ntohs(tvb, offset); @@ -1737,8 +1735,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); } ti = proto_tree_add_item(tree, proto_oamaal, tvb, offset, -1, FALSE); aal_tree = proto_item_add_subtree(ti, ett_oamaal); |