From 51a30142251e377ec28eb8584c56386c2481d6c0 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 31 Jan 2017 07:51:19 -0500 Subject: format_text_wmem -> format_text All cases of the "original" format_text have been handled to add the proper wmem allocator scope. Remove the "original" format_text and replace it with one that has a wmem allocator as a parameter. Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719 Reviewed-on: https://code.wireshark.org/review/19884 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-pvfs2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-pvfs2.c') diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index be9e09e98f..e5b23ece35 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -893,7 +893,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, size_t string_buffer_size = 0; char *string_buffer_temp; - formatted = format_text_wmem(wmem_packet_scope(), (guint8 *)string_buffer, + formatted = format_text(wmem_packet_scope(), (guint8 *)string_buffer, (int)strlen(string_buffer)); string_buffer_size = strlen(formatted) + 12 + 1; @@ -917,7 +917,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, } } else { if (string_data) { - string_buffer_print = format_text_wmem(wmem_packet_scope(), (guint8 *) string_buffer, + string_buffer_print = format_text(wmem_packet_scope(), (guint8 *) string_buffer, (int)strlen(string_buffer)); } else { string_buffer_print=""; -- cgit v1.2.3