diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-04-22 07:57:37 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-04-22 23:24:45 +0000 |
| commit | 8d6324f759639c7d3c0cab839ca1d3c42c93f895 (patch) | |
| tree | e2a36618d1c6892347c03bf479fc3eb15f5d9571 /epan/dissectors/packet-igmp.c | |
| parent | 825aa502e7a1730141a3bfbf463f23167fb0b975 (diff) | |
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 2 of a few
Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4
Reviewed-on: https://code.wireshark.org/review/8165
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-igmp.c')
| -rw-r--r-- | epan/dissectors/packet-igmp.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 76094857f2..db1b3b642c 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -165,7 +165,6 @@ static int hf_mtrace_q_fwd_code = -1; static int ett_igmp = -1; static int ett_group_record = -1; -static int ett_sqrv_bits = -1; static int ett_max_resp = -1; static int ett_mtrace_block = -1; @@ -422,19 +421,13 @@ dissect_v3_max_resp(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_v3_sqrv_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - proto_tree *tree; - guint8 bits; - - bits = tvb_get_guint8(tvb, offset); - - tree = proto_tree_add_subtree_format(parent_tree, tvb, offset, 1, - ett_sqrv_bits, NULL, "QRV=%d S=%s", bits&IGMP_V3_QRV_MASK, - (bits&IGMP_V3_S)?tfs_s.true_string:tfs_s.false_string); + static const int * bits[] = { + &hf_suppress, + &hf_qrv, + NULL + }; - /* S flag */ - proto_tree_add_boolean(tree, hf_suppress, tvb, offset, 1, bits); - /* QRV */ - proto_tree_add_uint(tree, hf_qrv, tvb, offset, 1, bits); + proto_tree_add_bitmask_list(parent_tree, tvb, offset, 1, bits, ENC_NA); offset += 1; return offset; @@ -1105,7 +1098,6 @@ proto_register_igmp(void) static gint *ett[] = { &ett_igmp, &ett_group_record, - &ett_sqrv_bits, &ett_max_resp, &ett_mtrace_block, }; |