diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
| commit | 0f0c111119811cf1c6c9353efdaaef302aca5930 (patch) | |
| tree | 1184b3876ae3b638c401313def0c8172b475b3f0 /epan/dissectors/packet-extreme.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-extreme.c')
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 1826b82a3f..321710f078 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -596,8 +596,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot return offset; } vlan_id = tvb_get_ntohs(tvb, offset); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%d", vlan_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%d", vlan_id); proto_item_append_text(vlan_item, ": ID %d", vlan_id); proto_tree_add_uint(vlan_tree, hf_edp_vlan_id, tvb, offset, 2, vlan_id); @@ -759,8 +758,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, offset += 38; col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", ctrlvlanid, sysmac_str); return offset; @@ -876,8 +874,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto offset += length; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESL"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", ctrlvlanid, sysmac_str); return offset; @@ -894,8 +891,7 @@ dissect_elsm_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, type = tvb_get_guint8(tvb, offset + 4); subtype = tvb_get_guint8(tvb, offset + 4 + 1); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " %s%s (#%d)", + col_append_fstr(pinfo->cinfo, COL_INFO, " %s%s (#%d)", val_to_str(type, elsm_type_vals, "Unknown (0x%02x)"), val_to_str(subtype, elsm_subtype_vals, " Unknown (0x%02x)"), seqno); @@ -1074,8 +1070,7 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "TLV with invalid length: %u", tlv_length); break; } - if (check_col(pinfo->cinfo, COL_INFO) && - tlv_type != EDP_TYPE_NULL) + if (tlv_type != EDP_TYPE_NULL) col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(tlv_type, edp_type_vals, "[0x%02x]")); |