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-dsi.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-dsi.c')
| -rw-r--r-- | epan/dissectors/packet-dsi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index e765e68667..4b7f59fb5a 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -512,13 +512,10 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 dsi_length; guint32 dsi_reserved; struct aspinfo aspinfo; - gint col_info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSI"); - col_info = check_col(pinfo->cinfo, COL_INFO); - if (col_info) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); dsi_flags = tvb_get_guint8(tvb, 0); dsi_command = tvb_get_guint8(tvb, 1); @@ -527,15 +524,12 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dsi_length = tvb_get_ntohl(tvb, 8); dsi_reserved = tvb_get_ntohl(tvb, 12); - if (col_info) { - col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%u)", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%u)", val_to_str(dsi_flags, flag_vals, "Unknown flag (0x%02x)"), val_to_str_ext(dsi_command, &func_vals_ext, "Unknown function (0x%02x)"), dsi_requestid); - } - if (tree) { ti = proto_tree_add_item(tree, proto_dsi, tvb, 0, -1, ENC_NA); |