diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-06 19:32:03 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-07 00:03:35 +0000 |
| commit | 4d58904a09c972cff7a114f33db2532d958997cb (patch) | |
| tree | 575156761f6f48bf7825513ea87d39cb569267ed /epan/dissectors/packet-tftp.c | |
| parent | 79fcc6a1a36e0637ce21f65a7e27bc6d90213509 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: Ie10ac4f5f04a23344d183e095bbafb23c6409144
Reviewed-on: https://code.wireshark.org/review/2904
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tftp.c')
| -rw-r--r-- | epan/dissectors/packet-tftp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 426feb7924..629a40f750 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -138,7 +138,6 @@ tftp_dissect_options(tvbuff_t *tvb, packet_info *pinfo, int offset, int value_offset; const char *optionname; const char *optionvalue; - proto_item *opt_item; proto_tree *opt_tree; while (tvb_offset_exists(tvb, offset)) { @@ -147,10 +146,9 @@ tftp_dissect_options(tvbuff_t *tvb, packet_info *pinfo, int offset, value_len = tvb_strsize(tvb, value_offset); /* length of value */ optionname = tvb_format_text(tvb, offset, option_len); optionvalue = tvb_format_text(tvb, value_offset, value_len); - opt_item = proto_tree_add_text(tree, tvb, offset, option_len+value_len, - "Option: %s = %s", optionname, optionvalue); + opt_tree = proto_tree_add_subtree_format(tree, tvb, offset, option_len+value_len, + ett_tftp_option, NULL, "Option: %s = %s", optionname, optionvalue); - opt_tree = proto_item_add_subtree(opt_item, ett_tftp_option); proto_tree_add_item(opt_tree, hf_tftp_option_name, tvb, offset, option_len, ENC_ASCII|ENC_NA); proto_tree_add_item(opt_tree, hf_tftp_option_value, tvb, value_offset, |