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-esio.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
| download | wireshark-0f0c111119811cf1c6c9353efdaaef302aca5930.tar.gz | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-esio.c')
| -rw-r--r-- | epan/dissectors/packet-esio.c | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index fc82d8eae2..30f8d308b3 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -145,34 +145,33 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIO"); col_clear(pinfo->cinfo, COL_INFO); esio_telegram_type = tvb_get_guint8(tvb,5); - if (check_col(pinfo->cinfo, COL_INFO)) { - switch (esio_telegram_type) { - case ESIO_TRANSFER: - esio_src_id = tvb_get_ntohl(tvb,16); - esio_nbr_data_transfers = tvb_get_guint8(tvb, 20); - esio_dst_id = tvb_get_ntohl(tvb,26); - col_add_fstr( pinfo->cinfo, COL_INFO, - "Data transfer: Src ID: %d, Dst ID(s): %d", - esio_src_id, esio_dst_id); - if (esio_nbr_data_transfers > 1) { - col_append_fstr( pinfo->cinfo, COL_INFO, - " ..."); - } - break; - case ESIO_STATUS: - esio_src_id = tvb_get_ntohl(tvb,16); - col_add_fstr( pinfo->cinfo, COL_INFO, - "Status/diag telegram: Src ID: %d", - esio_src_id); - break; - default: - /* All other telegrams */ - col_set_str( pinfo->cinfo, COL_INFO, - "Unknown telegram"); - break; - } - + + switch (esio_telegram_type) { + case ESIO_TRANSFER: + esio_src_id = tvb_get_ntohl(tvb,16); + esio_nbr_data_transfers = tvb_get_guint8(tvb, 20); + esio_dst_id = tvb_get_ntohl(tvb,26); + col_add_fstr( pinfo->cinfo, COL_INFO, + "Data transfer: Src ID: %d, Dst ID(s): %d", + esio_src_id, esio_dst_id); + if (esio_nbr_data_transfers > 1) { + col_append_fstr( pinfo->cinfo, COL_INFO, + " ..."); + } + break; + case ESIO_STATUS: + esio_src_id = tvb_get_ntohl(tvb,16); + col_add_fstr( pinfo->cinfo, COL_INFO, + "Status/diag telegram: Src ID: %d", + esio_src_id); + break; + default: + /* All other telegrams */ + col_set_str( pinfo->cinfo, COL_INFO, + "Unknown telegram"); + break; } + /* create display subtree for the protocol */ offset = 0; ti = proto_tree_add_item(tree, proto_esio, tvb, offset, -1, ENC_NA); |