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-eiss.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-eiss.c')
| -rw-r--r-- | epan/dissectors/packet-eiss.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index 0bca7184b0..dcb5e03978 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -130,10 +130,8 @@ static guint dissect_etv_bif_platform_ids(tvbuff_t *tvb, proto_tree *tree, guint offset) { proto_tree *platform_tree; - proto_item *pi; - pi = proto_tree_add_text(tree, tvb, offset, 15, "Platform Id"); - platform_tree = proto_item_add_subtree(pi, ett_eiss_platform_id); + platform_tree = proto_tree_add_subtree(tree, tvb, offset, 15, ett_eiss_platform_id, NULL, "Platform Id"); proto_tree_add_item(platform_tree, hf_pdtHWManufacturer, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(platform_tree, hf_pdtHWModel, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -159,7 +157,6 @@ dissect_etv_bif_platform_ids(tvbuff_t *tvb, proto_tree *tree, guint offset) static guint dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { - proto_item *pi; proto_tree *sub_tree; guint tag; @@ -169,9 +166,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu guint total_length; total_length = tvb_get_guint8(tvb, offset+1); - pi = proto_tree_add_text(tree, tvb, offset, (2+total_length), - "ETV Application Information Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, (2+total_length), + ett_eiss_desc, NULL, "ETV Application Information Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -211,9 +207,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu ENC_ASCII|ENC_NA); return (2+total_length); } else if (0xe1 == tag) { - pi = proto_tree_add_text(tree, tvb, offset, 6, - "ETV Media Time Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 6, + ett_eiss_desc, NULL, "ETV Media Time Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -228,9 +223,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu tvbuff_t *payload; tmp = tvb_get_ntohs(tvb, offset+1); - pi = proto_tree_add_text(tree, tvb, offset, (3+tmp), - "ETV Stream Event Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, (3+tmp), + ett_eiss_desc, NULL, "ETV Stream Event Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -359,10 +353,8 @@ dissect_eiss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (0 < packet_length) { proto_tree *eiss_desc_tree; - pi = proto_tree_add_text(eiss_tree, tvb, offset, - packet_length-offset, - "%s", "EISS Descriptor(s)"); - eiss_desc_tree = proto_item_add_subtree(pi, ett_eiss_desc); + eiss_desc_tree = proto_tree_add_subtree(eiss_tree, tvb, offset, + packet_length-offset, ett_eiss_desc, NULL, "EISS Descriptor(s)"); while (offset < packet_length) { offset += dissect_eiss_descriptors(tvb, pinfo, eiss_desc_tree, offset); |