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-ipmi-session.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-ipmi-session.c')
| -rw-r--r-- | epan/dissectors/packet-ipmi-session.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index f471be97a2..a51c25b396 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -157,20 +157,16 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * } /* Later it will be overridden with sub-dissector, if any */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - if (authtype == IPMI_AUTH_RMCPP) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP+"); - } else { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI"); - } + if (authtype == IPMI_AUTH_RMCPP) { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP+"); + } else { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI"); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Session ID 0x%x", session_id); - if (authtype == IPMI_AUTH_RMCPP) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s", - val_to_str_const(payloadtype, ipmi_payload_vals, "Unknown")); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "Session ID 0x%x", session_id); + if (authtype == IPMI_AUTH_RMCPP) { + col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s", + val_to_str_const(payloadtype, ipmi_payload_vals, "Unknown")); } if (tree) { |