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-sua.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-sua.c') diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index eded3c25e7..0ca45a16da 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -567,7 +567,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } #define ROUTING_CONTEXT_LENGTH 4 @@ -1480,7 +1480,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, source ? hf_sua_source_hostname : hf_sua_dest_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", hostname_length, - tvb_get_ephemeral_string(parameter_tvb, HOSTNAME_OFFSET, hostname_length)); + tvb_get_string(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length)); } #define IPV6_ADDRESS_LENGTH 16 -- cgit v1.2.3