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-v5ua.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-v5ua.c')
| -rw-r--r-- | epan/dissectors/packet-v5ua.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index a50ef51f78..1851b5d1ec 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -909,17 +909,15 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_ /* create proto_tree stuff */ switch(iua_version){ case RFC: - parameter_item = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", + parameter_tree = proto_tree_add_subtree(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, ett_v5ua_parameter, ¶meter_item, val_to_str_const(tag, parameter_tag_values, "Unknown parameter")); - parameter_tree = proto_item_add_subtree(parameter_item, ett_v5ua_parameter); /* add tag to the v5ua tree */ proto_tree_add_item(parameter_tree, hf_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, ENC_BIG_ENDIAN); break; case DRAFT: default: - parameter_item = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", + parameter_tree = proto_tree_add_subtree(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, ett_v5ua_parameter, ¶meter_item, val_to_str_const(tag, parameter_tag_draft_values, "Unknown parameter")); - parameter_tree = proto_item_add_subtree(parameter_item, ett_v5ua_parameter); /* add tag to the v5ua tree */ proto_tree_add_item(parameter_tree, hf_parameter_tag_draft, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, ENC_BIG_ENDIAN); @@ -1318,8 +1316,8 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre if (v5ua_tree) { /* create proto_tree stuff */ - common_header_item = proto_tree_add_text(v5ua_tree, common_header_tvb, COMMON_HEADER_OFFSET, tvb_length(common_header_tvb),"Common Msg-Header"); - common_header_tree = proto_item_add_subtree(common_header_item, ett_v5ua_common_header); + common_header_tree = proto_tree_add_subtree(v5ua_tree, common_header_tvb, COMMON_HEADER_OFFSET, -1, + ett_v5ua_common_header, &common_header_item, "Common Msg-Header"); /* add the components of the common header to the protocol tree */ proto_tree_add_item(common_header_tree, hf_version, common_header_tvb, COMMON_HEADER_VERSION_OFFSET, COMMON_HEADER_VERSION_LENGTH, ENC_BIG_ENDIAN); |