diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-05-21 22:20:29 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-27 11:02:30 +0000 |
| commit | 4963c772852134b75561290d152be2acbe0597d9 (patch) | |
| tree | c6e6f2f683587e58aea96355cdadd2472215c4c4 /epan/dissectors/packet-zbee-zdp-management.c | |
| parent | a25c46bc7b3d2ba2a3674cdcf9cfc1cc79bfc022 (diff) | |
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Final part.
While there change deprecated tvb_length-xxx() calls
Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79
Reviewed-on: https://code.wireshark.org/review/8642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-management.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp-management.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index b283f74061..7dbf47b03a 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -359,16 +359,16 @@ dissect_zbee_zdp_req_mgmt_leave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { guint offset = 0; guint64 ext_addr; - guint8 flags; + static const int * flags[] = { + &hf_zbee_zdp_leave_children, + &hf_zbee_zdp_leave_rejoin, + NULL + }; ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, 8, NULL); if (version >= ZBEE_VERSION_2007) { /* Flags present on ZigBee 2006 & later. */ - flags = tvb_get_guint8(tvb, offset); - if (tree) { - proto_tree_add_boolean(tree, hf_zbee_zdp_leave_children, tvb, offset, 1, flags & ZBEE_ZDP_MGMT_LEAVE_CHILDREN); - proto_tree_add_boolean(tree, hf_zbee_zdp_leave_rejoin, tvb, offset, 1, flags & ZBEE_ZDP_MGMT_LEAVE_REJOIN); - } + proto_tree_add_bitmask_list(tree, tvb, offset, 1, flags, ENC_NA); offset += 1; } |