aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-wassp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-07-06 14:21:40 -0400
committerMichael Mann <mmann78@netscape.net>2014-07-06 18:26:48 +0000
commitc71e88e4a9ad00600627b27ec6bd68cd3a929c58 (patch)
tree9a02a0c5a8dffff4d95504eb1f627c817c814400 /epan/dissectors/packet-wassp.c
parentbe4d42c6ab54169c8c027d3b1871a282fd9d0a9d (diff)
convert to proto_tree_add_subtree[_format]
Change-Id: I3efa2a81ab2685cde6eae0a00b24520478a545ce Reviewed-on: https://code.wireshark.org/review/2900 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-wassp.c')
-rw-r--r--epan/dissectors/packet-wassp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index aa0b7e8d76..608c05b79e 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -825,7 +825,6 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree,
{
guint32 tlv_type;
guint32 tlv_length;
- proto_item *tlv_item;
proto_item *tlv_tree;
proto_item *type_item;
int type_index;
@@ -834,14 +833,12 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_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(wassp_tree, tvb,
- offset, tlv_length,
+ tlv_tree = proto_tree_add_subtree_format(wassp_tree, tvb,
+ offset, tlv_length, ett_wassp_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_wassp_tlv_header);
type_item = proto_tree_add_item(tlv_tree, hf_wassp_tlv_type,
tvb, offset, 2, ENC_BIG_ENDIAN);
proto_item_append_text(type_item, " = %s",