diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-05 18:29:13 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-05 23:08:19 +0000 |
| commit | 0335ae339d4004ea8ee9b087bac7e1803685accb (patch) | |
| tree | 5404c6b0c626906b2192c53a4af6c511a711d287 /epan/dissectors/packet-x25.c | |
| parent | 318205e6999314d4fb0e0272ca4db2d347501f98 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I66f0bffb987568c3d4c14a06bdc90465c877b27f
Reviewed-on: https://code.wireshark.org/review/2867
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-x25.c')
| -rw-r--r-- | epan/dissectors/packet-x25.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 8cbfd525f0..80157d9ebe 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -703,9 +703,8 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb, packet_info *pinfo len = tvb_get_guint8(tvb, *offset); if (len && tree) { - ti = proto_tree_add_text(tree, tvb, *offset, len + 1, - "Facilities"); - facilities_tree = proto_item_add_subtree(ti, ett_x25_facilities); + facilities_tree = proto_tree_add_subtree(tree, tvb, *offset, len + 1, + ett_x25_facilities, NULL, "Facilities"); proto_tree_add_item(facilities_tree, hf_x25_facilities_length, tvb, *offset, 1, ENC_NA); } (*offset)++; @@ -1399,11 +1398,8 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (localoffset < tvb_reported_length(tvb)) /* user data */ { - if (x25_tree) { - ti = proto_tree_add_text(x25_tree, tvb, localoffset, -1, - "User data"); - userdata_tree = proto_item_add_subtree(ti, ett_x25_user_data); - } + userdata_tree = proto_tree_add_subtree(x25_tree, tvb, localoffset, -1, + ett_x25_user_data, &ti, "User data"); /* X.263/ISO 9577 says that: |