diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-06 14:21:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-06 18:26:48 +0000 |
| commit | c71e88e4a9ad00600627b27ec6bd68cd3a929c58 (patch) | |
| tree | 9a02a0c5a8dffff4d95504eb1f627c817c814400 /epan/dissectors/packet-wsp.c | |
| parent | be4d42c6ab54169c8c027d3b1871a282fd9d0a9d (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-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 2c2fef9107..38c0642e2d 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -5872,9 +5872,8 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo) offset += count; if (nEntries) { - ti = proto_tree_add_text(tree, tvb, offset - count, 0, - "Multipart body"); - sub_tree = proto_item_add_subtree(ti, ett_mpartlist); + sub_tree = proto_tree_add_subtree(tree, tvb, offset - count, 0, + ett_mpartlist, NULL, "Multipart body"); } while (nEntries--) { @@ -5886,12 +5885,12 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo) offset += count; DataLen = tvb_get_guintvar (tvb, offset, &count); offset += count; - if (tree) { - tvb_ensure_bytes_exist(tvb, part_start, HeadersLen + DataLen + (offset - part_start)); - ti = proto_tree_add_uint(sub_tree, hf_wsp_mpart, tvb, part_start, + + tvb_ensure_bytes_exist(tvb, part_start, HeadersLen + DataLen + (offset - part_start)); + ti = proto_tree_add_uint(sub_tree, hf_wsp_mpart, tvb, part_start, HeadersLen + DataLen + (offset - part_start), partnr); - mpart_tree = proto_item_add_subtree(ti, ett_multiparts); - } + mpart_tree = proto_item_add_subtree(ti, ett_multiparts); + nextOffset = add_content_type (mpart_tree, tvb, offset, &contentType, &contentTypeStr); |