From a0c53ffaa1bb46d8c9db2ec739401aa411c9790e Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 22 Sep 2013 15:50:55 +0000 Subject: 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 --- epan/dissectors/packet-gtpv2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-gtpv2.c') diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 4e759cf126..814fdad659 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1449,7 +1449,7 @@ dissect_gtpv2_apn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - apn = tvb_get_ephemeral_string(tvb, offset + 1, length - 1); + apn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, length - 1); for (;;) { if (name_len >= length - 1) break; @@ -1458,7 +1458,7 @@ dissect_gtpv2_apn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto apn[tmp] = '.'; } } else{ - apn = tvb_get_ephemeral_string(tvb, offset, length); + apn = tvb_get_string(wmem_packet_scope(), tvb, offset, length); } proto_tree_add_string(tree, hf_gtpv2_apn, tvb, offset, length, apn); } @@ -4416,7 +4416,7 @@ dissect_gtpv2_fqdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - fqdn = tvb_get_ephemeral_string(tvb, offset + 1, length - 1); + fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, length - 1); for (;;) { if (name_len >= length - 1) break; @@ -4425,7 +4425,7 @@ dissect_gtpv2_fqdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot fqdn[tmp] = '.'; } } else { - fqdn = tvb_get_ephemeral_string(tvb, offset, length); + fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset, length); } proto_tree_add_string(tree, hf_gtpv2_fqdn, tvb, offset, length, fqdn); proto_item_append_text(item, "%s", fqdn); -- cgit v1.2.3