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-fcswils.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-fcswils.c')
| -rw-r--r-- | epan/dissectors/packet-fcswils.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 0547c59622..d9fbc25aa0 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1852,19 +1852,17 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_INFO)) { - if (isreq == FC_SWILS_REQ) { - col_add_str(pinfo->cinfo, COL_INFO, + if (isreq == FC_SWILS_REQ) { + col_add_str(pinfo->cinfo, COL_INFO, + val_to_str(opcode, fc_swils_opcode_key_val, "0x%x")); + } + else if (opcode == FC_SWILS_SWRJT) { + col_add_fstr(pinfo->cinfo, COL_INFO, "SW_RJT (%s)", + val_to_str(failed_opcode, fc_swils_opcode_key_val, "0x%x")); + } + else { + col_add_fstr(pinfo->cinfo, COL_INFO, "SW_ACC (%s)", val_to_str(opcode, fc_swils_opcode_key_val, "0x%x")); - } - else if (opcode == FC_SWILS_SWRJT) { - col_add_fstr(pinfo->cinfo, COL_INFO, "SW_RJT (%s)", - val_to_str(failed_opcode, fc_swils_opcode_key_val, "0x%x")); - } - else { - col_add_fstr(pinfo->cinfo, COL_INFO, "SW_ACC (%s)", - val_to_str(opcode, fc_swils_opcode_key_val, "0x%x")); - } } if (tree) { |