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-fcfcs.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-fcfcs.c')
| -rw-r--r-- | epan/dissectors/packet-fcfcs.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index d3cb2db466..b486ae8ed1 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -825,10 +825,8 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g_hash_table_insert (fcfcs_req_hash, req_key, cdata); } - if (check_col (pinfo->cinfo, COL_INFO)) { - col_add_str (pinfo->cinfo, COL_INFO, + col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_fcs_opcode_abbrev_val, "0x%x")); - } } else { /* Opcode is ACC or RJT */ @@ -837,12 +835,10 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->rxid, NO_PORT2); isreq = 0; if (!conversation) { - if (tree && (opcode == FCCT_MSG_ACC)) { - if (check_col (pinfo->cinfo, COL_INFO)) { - col_add_str (pinfo->cinfo, COL_INFO, + if (opcode == FCCT_MSG_ACC) { + col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_fcs_opcode_abbrev_val, "0x%x")); - } /* No record of what this accept is for. Can't decode */ proto_tree_add_text (fcfcs_tree, tvb, 0, tvb_length (tvb), "No record of Exchg. Unable to decode MSG_ACC/RJT"); @@ -862,18 +858,16 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) failed_opcode = cdata->opcode; } - if (check_col (pinfo->cinfo, COL_INFO)) { - if (opcode != FCCT_MSG_RJT) { - col_add_fstr (pinfo->cinfo, COL_INFO, "MSG_ACC (%s)", - val_to_str (opcode, fc_fcs_opcode_abbrev_val, - "0x%x")); - } - else { - col_add_fstr (pinfo->cinfo, COL_INFO, "MSG_RJT (%s)", - val_to_str (failed_opcode, - fc_fcs_opcode_abbrev_val, - "0x%x")); - } + if (opcode != FCCT_MSG_RJT) { + col_add_fstr (pinfo->cinfo, COL_INFO, "MSG_ACC (%s)", + val_to_str (opcode, fc_fcs_opcode_abbrev_val, + "0x%x")); + } + else { + col_add_fstr (pinfo->cinfo, COL_INFO, "MSG_RJT (%s)", + val_to_str (failed_opcode, + fc_fcs_opcode_abbrev_val, + "0x%x")); } if (tree) { |