diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-atm.c | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
| download | wireshark-e971354a546be5efc284c72e49689a2e337bc198.tar.gz | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index cc301de2b0..74d2eca7dc 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -661,8 +661,7 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; tvbuff_t *next_tvb_le_client; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM LANE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM LANE"); /* Is it LE Control, 802.3, 802.5, or "none of the above"? */ switch (pinfo->pseudo_header->atm.subtype) { @@ -1679,8 +1678,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (aal) { case AAL_1: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, FALSE); @@ -1706,8 +1704,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* * XXX - or should this be the CS PDU? */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, FALSE); @@ -1743,8 +1740,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AAL_OAMCELL: if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } @@ -1816,8 +1812,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->pseudo_header->atm.aal = AAL_SIGNALLING; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); if (!pseudowire_mode) { switch (pinfo->pseudo_header->atm.channel) { @@ -1913,8 +1908,7 @@ dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *atm_ti = NULL; gboolean pseudowire_mode = (NULL != pinfo->private_data); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); if (!pseudowire_mode) { if (tree) { |