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-tzsp.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-tzsp.c')
| -rw-r--r-- | epan/dissectors/packet-tzsp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 32359f9ab1..ac8467c4ef 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -165,7 +165,6 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) { guint8 tag, length, fcs_err = 0, encr = 0, seen_fcs_err = 0; proto_tree *tag_tree; - proto_item *tag_item; /* * Read all option tags in an endless loop. If the packet is malformed this @@ -175,14 +174,12 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) tag = tvb_get_guint8(tvb, pos); if ((tag != TZSP_HDR_PAD) && (tag != TZSP_HDR_END)) { length = tvb_get_guint8(tvb, pos+1); - tag_item = proto_tree_add_text(tree, tvb, pos, 2+length, "%s", val_to_str_const(tag, option_tag_vals, "Unknown")); + tag_tree = proto_tree_add_subtree(tree, tvb, pos, 2+length, ett_tag, NULL, val_to_str_const(tag, option_tag_vals, "Unknown")); } else { - tag_item = proto_tree_add_text(tree, tvb, pos, 1, "%s", val_to_str_const(tag, option_tag_vals, "Unknown")); + tag_tree = proto_tree_add_subtree(tree, tvb, pos, 1, ett_tag, NULL, val_to_str_const(tag, option_tag_vals, "Unknown")); length = 0; } - tag_tree = proto_item_add_subtree(tag_item, ett_tag); - proto_tree_add_item(tag_tree, hf_option_tag, tvb, pos, 1, ENC_NA); pos++; if ((tag != TZSP_HDR_PAD) && (tag != TZSP_HDR_END)) { |