aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mndp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-07-01 18:31:05 -0400
committerMichael Mann <mmann78@netscape.net>2014-07-04 16:59:14 +0000
commitc7a6e6fa130611941a5d05e7646d7c38d78b2d0a (patch)
tree435964d38acd7196e6d6aa58be80e44634ebfa9c /epan/dissectors/packet-mndp.c
parent93517043e96c26a1d3dad49c2f57b345e3bbbba0 (diff)
convert to proto_tree_add_subtree[_format]
Change-Id: I621f2e2cad9403449cb78f45302388f0c874d3bc Reviewed-on: https://code.wireshark.org/review/2852 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mndp.c')
-rw-r--r--epan/dissectors/packet-mndp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c
index 4dd58d94a7..ce3109e908 100644
--- a/epan/dissectors/packet-mndp.c
+++ b/epan/dissectors/packet-mndp.c
@@ -149,7 +149,6 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree,
{
guint32 tlv_type;
guint32 tlv_length;
- proto_item *tlv_item;
proto_item *tlv_tree;
proto_item *type_item;
int type_index;
@@ -159,14 +158,13 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree,
tlv_type = tvb_get_ntohs(tvb, offset);
tlv_length = tvb_get_ntohs(tvb, offset + 2);
/* DISSECTOR_ASSERT(tlv_length >= 4); */
- tlv_item = proto_tree_add_text(mndp_tree, tvb,
- offset, tlv_length+4,
+ tlv_tree = proto_tree_add_subtree_format(mndp_tree, tvb,
+ offset, tlv_length+4, ett_mndp_tlv_header, NULL,
"T %d, L %d: %s",
tlv_type,
tlv_length,
extval_to_str_idx(tlv_type, value_array, NULL, "Unknown"));
- tlv_tree = proto_item_add_subtree(tlv_item,
- ett_mndp_tlv_header);
+
type_item = proto_tree_add_item(tlv_tree, hf_mndp_tlv_type,
tvb, offset, 2, ENC_BIG_ENDIAN);
proto_item_append_text(type_item, " = %s",