diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-29 09:13:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-29 14:52:33 +0000 |
| commit | e8a8d62dc33099ee2e0d9d405b48e74097f7688d (patch) | |
| tree | 0d79d9841b29f735cdf0005da3a6c747591586ea /epan/dissectors/packet-isis-hello.c | |
| parent | fe4b7ee625c046bc09a7d8ae55afb0e16cb17fc3 (diff) | |
proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-isis-hello.c')
| -rw-r--r-- | epan/dissectors/packet-isis-hello.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index e93e6817eb..7bdb8183a2 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -145,7 +145,7 @@ dissect_hello_mt_port_cap_spb_mcid_clv(tvbuff_t *tvb, packet_info* pinfo, { const int MCID_LEN = 51; const int SUBLEN = 2 * MCID_LEN; - proto_tree *subtree, *ti; + proto_tree *subtree; if (sublen != SUBLEN) { proto_tree_add_expert_format(tree, pinfo, &ei_isis_hello_short_packet, tvb, offset, -1, @@ -154,9 +154,8 @@ dissect_hello_mt_port_cap_spb_mcid_clv(tvbuff_t *tvb, packet_info* pinfo, } - ti = proto_tree_add_text( tree, tvb, offset-2, sublen+2, + subtree = proto_tree_add_subtree_format( tree, tvb, offset-2, sublen+2, ett_isis_hello_clv_mt_port_cap_spb_mcid, NULL, "SPB MCID: Type: 0x%02x, Length: %d", subtype, sublen); - subtree = proto_item_add_subtree(ti, ett_isis_hello_clv_mt_port_cap_spb_mcid); /* MCID: */ proto_tree_add_item(subtree, hf_isis_hello_mcid, tvb, offset, MCID_LEN, ENC_NA); @@ -179,12 +178,11 @@ dissect_hello_mt_port_cap_spb_digest_clv(tvbuff_t *tvb, packet_info* pinfo, return; } else { - proto_tree *subtree, *ti; + proto_tree *subtree; const guint8 vad = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_text( tree, tvb, offset-2, sublen+2, + subtree = proto_tree_add_subtree_format( tree, tvb, offset-2, sublen+2, ett_isis_hello_clv_mt_port_cap_spb_digest, NULL, "SPB Digest: Type: 0x%02x, Length: %d", subtype, sublen); - subtree = proto_item_add_subtree(ti, ett_isis_hello_clv_mt_port_cap_spb_digest); proto_tree_add_text( subtree, tvb, offset, 1, "V: %d, A: %d, D: %d", @@ -203,12 +201,11 @@ static void dissect_hello_mt_port_cap_spb_bvid_tuples_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset, int subtype, int sublen) { - proto_tree *subtree, *ti; + proto_tree *subtree; int subofs = offset; - ti = proto_tree_add_text( tree, tvb, offset-2, sublen+2, + subtree = proto_tree_add_subtree_format( tree, tvb, offset-2, sublen+2, ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples, NULL, "SPB Base Vlan Identifiers: Type: 0x%02x, Length: %d", subtype, sublen); - subtree = proto_item_add_subtree(ti, ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples); while (sublen > 0) { if (sublen < 6) { |