diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-25 22:59:50 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-26 11:41:10 +0000 |
commit | f7987091bab94f2403024c34702e9d5007a5d790 (patch) | |
tree | a56b8dfd1c87a789563ffa3b8a7277c4bd127afe /epan/dissectors/packet-foundry.c | |
parent | 732656c6f3636ba7e0672a9d8fc878255f0f8d3f (diff) |
convert to proto_tree_add_subtree[_format]
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66
Reviewed-on: https://code.wireshark.org/review/2667
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-foundry.c')
-rw-r--r-- | epan/dissectors/packet-foundry.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index c3fa37930e..624d2f90ed 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -111,7 +111,6 @@ static const value_string fdp_type_vals[] = { static int dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length _U_, proto_tree *tree) { - proto_item *tlv_item; proto_tree *tlv_tree; guint16 tlv_type; guint16 tlv_length; @@ -119,12 +118,11 @@ dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length tlv_type = tvb_get_ntohs(tvb, offset); tlv_length = tvb_get_ntohs(tvb, offset + 2); - tlv_item = proto_tree_add_text(tree, tvb, offset, 4, - "Length %d, type %d = %s", + tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4, + ett_fdp_tlv_header, NULL, "Length %d, type %d = %s", tlv_length, tlv_type, val_to_str(tlv_type, fdp_type_vals, "Unknown (%d)")); - tlv_tree = proto_item_add_subtree(tlv_item, ett_fdp_tlv_header); proto_tree_add_uint(tlv_tree, hf_fdp_tlv_type, tvb, offset, 2, tlv_type); offset += 2; |