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-dhcp-failover.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-dhcp-failover.c') diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index a32b8edae2..47fad19997 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -569,7 +569,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * XXX - if this is truly like DHCP option 81, * we need to dissect it as such. */ - proto_item_append_text(oi,", \"%s\"", tvb_get_ephemeral_string(tvb, offset, option_length)); + proto_item_append_text(oi,", \"%s\"", tvb_get_string(wmem_packet_scope(), tvb, offset, option_length)); proto_tree_add_item(option_tree, hf_dhcpfo_client_identifier, tvb, offset, @@ -634,7 +634,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case DHCP_FO_PD_VENDOR_CLASS: vendor_class_str = - tvb_get_ephemeral_string(tvb, offset, option_length); + tvb_get_string(wmem_packet_scope(), tvb, offset, option_length); proto_item_append_text(oi,", \"%s\"", format_text(vendor_class_str, option_length)); proto_tree_add_string(option_tree, -- cgit v1.2.1