diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-08-15 09:39:05 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-08-16 02:32:12 +0000 |
| commit | 2e2129a9140a4be860fa09c77fd9f2d550c6fbda (patch) | |
| tree | be5e099073bc8922523ded107a99b9be645f2e56 /epan/dissectors/packet-bacapp.c | |
| parent | 8b4572728d541e1039e4665dca8c6427db4a2132 (diff) | |
Conversion of random proto_tree_add_text calls.
Change-Id: I6505ce34de84bfe46d5bc7b4d6a3c6044f3fb4b5
Reviewed-on: https://code.wireshark.org/review/10041
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bacapp.c')
| -rw-r--r-- | epan/dissectors/packet-bacapp.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index c9fe6a286c..1abf510e8c 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -7276,19 +7276,18 @@ fVendorIdentifier(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off tag_len = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); if (fUnsigned32(tvb, offset + tag_len, lvt, &val)) - ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s: %s (%u)", + subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len, + ett_bacapp_tag, &ti, "%s: %s (%u)", label, val_to_str_ext_const(val, &BACnetVendorIdentifiers_ext, "Unknown Vendor"), val); else - ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s - %u octets (Unsigned)", label, lvt); - subtree = proto_item_add_subtree(ti, ett_bacapp_tag); + subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len, + ett_bacapp_tag, &ti, "%s - %u octets (Unsigned)", label, lvt); fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt); if ((lvt < 1) || (lvt > 2)) { /* vendorIDs >= 1 and <= 2 are supported */ - proto_tree_add_expert_format(tree, pinfo, &ei_bacapp_bad_length, tvb, 0, lvt, + expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length, "Wrong length indicated. Expected 1 or 2, got %u", lvt); return offset+tag_len+lvt; } @@ -7312,17 +7311,16 @@ fRestartReason(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset tag_len = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); if (fUnsigned32(tvb, offset + tag_len, lvt, &val)) - ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s: %s (%u)", label, + subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len, + ett_bacapp_tag, &ti, "%s: %s (%u)", label, val_to_str_const(val, BACnetRestartReason, "Unknown reason"), val); else - ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s - %u octets (Unsigned)", label, lvt); - subtree = proto_item_add_subtree(ti, ett_bacapp_tag); + subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len, + ett_bacapp_tag, &ti, "%s - %u octets (Unsigned)", label, lvt); fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt); if (lvt != 1) { - proto_tree_add_expert_format(tree, pinfo, &ei_bacapp_bad_length, tvb, 0, lvt, + expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length, "Wrong length indicated. Expected 1, got %u", lvt); return offset+tag_len+lvt; } |