diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-08-17 23:06:21 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-18 04:05:00 +0000 |
| commit | acc0c14e2f1e404feef3341a0cc76d250618ce24 (patch) | |
| tree | e6601b8caaa07f3dc290d0bda3c23d0dac630627 /epan/dissectors/packet-xmpp-core.c | |
| parent | 8fd719731be4de56c438531c0f34315de5da3554 (diff) | |
Eliminate proto_tree_add_text from XMPP dissectors.
Change-Id: I32fdf085ef484d147d9f0b27c56efba41bb827bf
Reviewed-on: https://code.wireshark.org/review/10086
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-xmpp-core.c')
| -rw-r--r-- | epan/dissectors/packet-xmpp-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 99d24c560f..2e6073e6fd 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -584,7 +584,8 @@ xmpp_failure_text(proto_tree *tree, tvbuff_t *tvb, xmpp_element_t *element) { xmpp_attr_t *lang = xmpp_get_attr(element,"xml:lang"); - proto_tree_add_text(tree, tvb, element->offset, element->length, "TEXT%s: %s", + proto_tree_add_string_format(tree, hf_xmpp_failure_text, tvb, element->offset, element->length, + element->data?element->data->value:"", "TEXT%s: %s", lang?wmem_strdup_printf(wmem_packet_scope(), "(%s)",lang->value):"", element->data?element->data->value:""); } @@ -593,7 +594,7 @@ void xmpp_xml_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, xmpp_element_t *packet) { col_add_fstr(pinfo->cinfo, COL_INFO, "XML "); - proto_tree_add_text(tree, tvb, packet->offset, packet->length, "XML HEADER VER. %s","1.0"); + proto_tree_add_string(tree, hf_xmpp_xml_header_version, tvb, packet->offset, packet->length, "1.0"); } void @@ -633,7 +634,7 @@ xmpp_stream_close(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo) if((elem = tvbparse_get(tt,want_stream_end_tag))!=NULL) { - proto_tree_add_text(tree, tvb, elem->offset, elem->len, "STREAM END"); + proto_tree_add_item(tree, hf_xmpp_stream_end, tvb, elem->offset, elem->len, ENC_NA); col_add_fstr(pinfo->cinfo, COL_INFO, "STREAM END"); return TRUE; |