diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-09-06 21:32:39 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-09-07 17:08:29 +0000 |
| commit | 2b27d91f2671d9fb9d9f8791e75d83c0cb3b73b2 (patch) | |
| tree | f33941c31fdb5d755d6690d4d5d577a92e22fb50 /epan/dissectors/packet-xmpp-conference.c | |
| parent | f76b4d934662451f05820408b4841d08a2b2d351 (diff) | |
Eliminate proto_tree_add_text from some of the dissectors.
Other minor cleanups while in the area.
Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48
Reviewed-on: https://code.wireshark.org/review/4022
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-xmpp-conference.c')
| -rw-r--r-- | epan/dissectors/packet-xmpp-conference.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index c1a3def5c9..6152f9bc4e 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/epan/dissectors/packet-xmpp-conference.c @@ -102,7 +102,6 @@ xmpp_conference_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e static void xmpp_conf_desc(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element) { - proto_item *desc_item; proto_tree *desc_tree; xmpp_attr_info attrs_info [] = { @@ -121,8 +120,7 @@ xmpp_conf_desc(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element }; */ - desc_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CONFERENCE DESCRIPTION"); - desc_tree = proto_item_add_subtree(desc_item, ett_xmpp_conf_desc); + desc_tree = proto_tree_add_subtree(tree, tvb, element->offset, element->length, ett_xmpp_conf_desc, NULL, "CONFERENCE DESCRIPTION"); xmpp_change_elem_to_attrib("subject", "subject", element, xmpp_transform_func_cdata); xmpp_change_elem_to_attrib("display-text", "display-text", element, xmpp_transform_func_cdata); |