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-zdp.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-zdp.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 71b545385a..79705f3416 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -1110,12 +1110,8 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Update info. */ - if (tree) { - proto_item_append_text(zdp_tree, ", %s", val_to_str_const(cluster, zbee_zdp_cluster_names, "Unknown Cluster")); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cluster, zbee_zdp_cluster_names, "Unknown Cluster")); - } + proto_item_append_text(zdp_tree, ", %s", val_to_str_const(cluster, zbee_zdp_cluster_names, "Unknown Cluster")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cluster, zbee_zdp_cluster_names, "Unknown Cluster")); /* Create a new tvb for the zdp message. */ zdp_tvb = tvb_new_subset_remaining(tvb, offset); |