diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-22 16:01:36 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-22 21:07:16 +0000 |
| commit | 188aa9a80eea47842988f1b860931d25e1ca08bd (patch) | |
| tree | 9b6faf83e26edb43fe6befe6d2ff01c4b6daaa89 /epan/dissectors/packet-aim.c | |
| parent | 3fc441e7a5008640c68ec985e669d5092414a519 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df
Reviewed-on: https://code.wireshark.org/review/2560
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index f3616b2f5c..0a453a44e0 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -689,11 +689,10 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, if( aim_tree && subtype != NULL ) { offset = orig_offset; - ti1 = proto_tree_add_text(aim_tree, tvb, 6, 10, + aim_tree_fnac = proto_tree_add_subtree_format(aim_tree, tvb, 6, 10, ett_aim_fnac, NULL, "FNAC: Family: %s (0x%04x), Subtype: %s (0x%04x)", family ? family->name : "Unknown", family_id, (subtype && subtype->name) ? subtype->name : "Unknown", subtype_id); - aim_tree_fnac = proto_item_add_subtree(ti1, ett_aim_fnac); proto_tree_add_uint_format_value (aim_tree_fnac, hf_aim_fnac_family, tvb, offset, 2, family_id, "%s (0x%04x)", @@ -809,18 +808,16 @@ dissect_aim_buddyname(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree) { guint8 buddyname_length = 0; - proto_item *ti = NULL; - proto_tree *buddy_tree = NULL; + proto_tree *buddy_tree; buddyname_length = tvb_get_guint8(tvb, offset); offset++; if(tree) { - ti = proto_tree_add_text(tree, tvb, offset-1, 1+buddyname_length, - "Buddy: %s", + buddy_tree = proto_tree_add_subtree_format(tree, tvb, offset-1, 1+buddyname_length, + ett_aim_buddyname, NULL, "Buddy: %s", tvb_format_text(tvb, offset, buddyname_length)); - buddy_tree = proto_item_add_subtree(ti, ett_aim_buddyname); proto_tree_add_item(buddy_tree, hf_aim_buddyname_len, tvb, offset-1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(buddy_tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA); } @@ -1330,9 +1327,8 @@ dissect_aim_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, else desc = "Unknown"; - ti1 = proto_tree_add_text(tree, tvb, offset, length + 4, "TLV: %s", desc); - - tlv_tree = proto_item_add_subtree(ti1, ett_aim_tlv); + tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, length + 4, + ett_aim_tlv, NULL, "TLV: %s", desc); proto_tree_add_text(tlv_tree, tvb, offset, 2, "Value ID: %s (0x%04x)", desc, valueid); |