diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-05 18:29:13 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-05 23:08:19 +0000 |
| commit | 0335ae339d4004ea8ee9b087bac7e1803685accb (patch) | |
| tree | 5404c6b0c626906b2192c53a4af6c511a711d287 /epan/dissectors/packet-xmpp-other.c | |
| parent | 318205e6999314d4fb0e0272ca4db2d347501f98 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I66f0bffb987568c3d4c14a06bdc90465c877b27f
Reviewed-on: https://code.wireshark.org/review/2867
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-xmpp-other.c')
| -rw-r--r-- | epan/dissectors/packet-xmpp-other.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 97eb3191fe..c9ebea7385 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.c @@ -539,7 +539,6 @@ xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t static void xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element) { - proto_item *range_item; proto_tree *range_tree; xmpp_attr_info attrs_info[] = { @@ -547,8 +546,7 @@ xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ele {"length", NULL, FALSE, TRUE, NULL, NULL} }; - range_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "RANGE: "); - range_tree = proto_item_add_subtree(range_item, ett_xmpp_si_file_range); + range_tree = proto_tree_add_subtree(tree, tvb, element->offset, element->length, ett_xmpp_si_file_range, NULL, "RANGE: "); xmpp_display_attrs(range_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info)); @@ -921,7 +919,6 @@ xmpp_muc_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * static void xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element) { - proto_item *hist_item; proto_tree *hist_tree; xmpp_attr_info attrs_info[] = { @@ -931,8 +928,7 @@ xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_eleme {"since", NULL, FALSE, TRUE, NULL, NULL} }; - hist_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "HISTORY: "); - hist_tree = proto_item_add_subtree(hist_item, ett_xmpp_muc_hist); + hist_tree = proto_tree_add_subtree(tree, tvb, element->offset, element->length, ett_xmpp_muc_hist, NULL, "HISTORY: "); xmpp_display_attrs(hist_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info)); @@ -1237,7 +1233,6 @@ xmpp_hashes(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t static void xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element) { - proto_item *hash_item; proto_tree *hash_tree; xmpp_attr_info attrs_info[] = { @@ -1248,8 +1243,7 @@ xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_eleme xmpp_attr_t *fake_cdata = xmpp_ep_init_attr_t(xmpp_elem_cdata(element), element->offset, element->length); g_hash_table_insert(element->attrs, (gpointer)"value", fake_cdata); - hash_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "HASH"); - hash_tree = proto_item_add_subtree(hash_item, ett_xmpp_hashes_hash); + hash_tree = proto_tree_add_subtree(tree, tvb, element->offset, element->length, ett_xmpp_hashes_hash, NULL, "HASH"); xmpp_display_attrs(hash_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info)); xmpp_display_elems(hash_tree, element, pinfo, tvb, NULL, 0); |