diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-xmpp-utils.c | |
parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) |
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
Diffstat (limited to 'epan/dissectors/packet-xmpp-utils.c')
-rw-r--r-- | epan/dissectors/packet-xmpp-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 3290184343..564d21489c 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -553,7 +553,7 @@ xmpp_xml_frame_to_element_t(xml_frame_t *xml_frame, xmpp_element_t *parent, tvbu if((elem = tvbparse_get(tt,want_stream_end_with_ns))!=NULL) { - node->default_ns_abbrev = tvb_get_ephemeral_string(elem->sub->tvb, elem->sub->offset, elem->sub->len); + node->default_ns_abbrev = tvb_get_string(wmem_packet_scope(), elem->sub->tvb, elem->sub->offset, elem->sub->len); } child = xml_frame->first_child; @@ -729,7 +729,7 @@ xmpp_element_to_string(tvbuff_t *tvb, xmpp_element_t *element) if(tvb_offset_exists(tvb, element->offset+element->length-1)) { - buff = tvb_get_ephemeral_string(tvb, element->offset, element->length); + buff = tvb_get_string(wmem_packet_scope(), tvb, element->offset, element->length); } return buff; } @@ -741,7 +741,7 @@ xmpp_attr_to_string(tvbuff_t *tvb, xmpp_attr_t *attr) if(tvb_offset_exists(tvb, attr->offset + attr->length-1)) { - buff = tvb_get_ephemeral_string(tvb, attr->offset, attr->length); + buff = tvb_get_string(wmem_packet_scope(), tvb, attr->offset, attr->length); } return buff; } |