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-fefd.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-fefd.c')
| -rw-r--r-- | epan/dissectors/packet-fefd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index e92b92107d..603a0c4199 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -152,10 +152,9 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length - 4)); if (tree) { - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - length, "Device ID: %s", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + length, ett_fefd_tlv, NULL, "Device ID: %s", tvb_format_stringzpad(tvb, offset + 4, length - 4)); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, @@ -184,10 +183,9 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_stringzpad(tvb, offset + 4, real_length - 4)); if (tree) { - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - real_length, "Port ID: %s", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + real_length, ett_fefd_tlv, NULL, "Port ID: %s", tvb_format_text(tvb, offset + 4, real_length - 4)); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, @@ -206,11 +204,10 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TYPE_DEVICE_NAME: case TYPE_SEQUENCE_NUMBER: default: - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - length, "Type: %s, length: %u", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + length, ett_fefd_tlv, NULL, "Type: %s, length: %u", val_to_str(type, type_vals, "Unknown (0x%04x)"), length); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, |