diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 19:46:54 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 19:46:54 +0000 |
| commit | f42e5bc9c0eb6c0e228018711694c80cdc5bc5c1 (patch) | |
| tree | c84185fcaa21ac4b694206b5d263a78a22bea491 /epan/dissectors/packet-zbee-zcl.c | |
| parent | c5d092ec3a228d55fcedd88d86f78006abbd7064 (diff) | |
Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors.
svn path=/trunk/; revision=49941
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index ab02a62fdd..552ab7b9c9 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -823,20 +823,14 @@ static void dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree call_dissector(cluster_handle, payload_tvb, pinfo, zcl_tree); } else { - if ( tree ) { - proto_item_append_text(proto_root, ", Cluster-specific Command: 0x%02x, Seq: %u", - packet.cmd_id, packet.tran_seqno); - } + proto_item_append_text(proto_root, ", Cluster-specific Command: 0x%02x, Seq: %u", + packet.cmd_id, packet.tran_seqno); - if ( check_col(pinfo->cinfo, COL_INFO) ) { - col_append_fstr(pinfo->cinfo, COL_INFO, "Command: 0x%02x, Seq: %u", - packet.cmd_id, packet.tran_seqno); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "Command: 0x%02x, Seq: %u", + packet.cmd_id, packet.tran_seqno); - if ( zcl_tree ) { - proto_tree_add_uint(zcl_tree, hf_zbee_zcl_cs_cmd_id, tvb, offset, (int)sizeof(guint8), - packet.cmd_id); - } + proto_tree_add_uint(zcl_tree, hf_zbee_zcl_cs_cmd_id, tvb, offset, (int)sizeof(guint8), + packet.cmd_id); offset += (int)sizeof(guint8); /* Don't decode cluster-specific commands */ |