diff options
author | Michael Mann <mmann78@netscape.net> | 2014-07-09 21:21:32 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-07-10 01:51:21 +0000 |
commit | e6c87fe6b13f43d0c74ea8516d83a38ea4317688 (patch) | |
tree | 27eb9cf5e28b7fdb4fd99477b64e1062b7102cf6 /plugins/docsis/packet-type29ucd.c | |
parent | 9b182b7097e339501977f595903c2e837055fb1d (diff) |
convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/docsis/packet-type29ucd.c')
-rw-r--r-- | plugins/docsis/packet-type29ucd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index e4f48776fe..922af953b5 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -196,7 +196,6 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) guint8 type, length; guint8 tlvlen, tlvtype; proto_tree *burst_descr_tree; - proto_item *it; proto_tree *type29ucd_tree; proto_item *type29ucd_item; guint16 len; @@ -408,11 +407,10 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) break; /* DOCSIS 1.1 BURST DESCRIPTOR */ case type29ucd_BURST_DESCR: - it = - proto_tree_add_text (type29ucd_tree, tvb, pos, length, - "4 Burst Descriptor (Length = %u)", + burst_descr_tree = + proto_tree_add_subtree_format(type29ucd_tree, tvb, pos, length, + ett_burst_descr, NULL, "4 Burst Descriptor (Length = %u)", length); - burst_descr_tree = proto_item_add_subtree (it, ett_burst_descr); proto_tree_add_item (burst_descr_tree, hf_docsis_type29ucd_iuc, tvb, pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; @@ -560,11 +558,10 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) break; /* DOCSIS 2.0 Upstream Channel Descriptor */ case type29ucd_BURST_DESCR5: - it = - proto_tree_add_text (type29ucd_tree, tvb, pos, length, - "5 Burst Descriptor (Length = %u)", + burst_descr_tree = + proto_tree_add_subtree_format(type29ucd_tree, tvb, pos, length, + ett_burst_descr, NULL, "5 Burst Descriptor (Length = %u)", length); - burst_descr_tree = proto_item_add_subtree (it, ett_burst_descr); proto_tree_add_item (burst_descr_tree, hf_docsis_type29ucd_iuc, tvb, pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; |