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-sigcomp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-sigcomp.c') diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 68a267302b..d345137e6c 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -4105,7 +4105,7 @@ execute_next_instruction: if (print_level_3 ) { proto_tree_add_uint_format(udvm_tree, hf_sigcomp_state_value, bytecode_tvb, 0, 0, buff[k], " Addr: %5u State value: %u (0x%x) ASCII(%s)", - k,buff[k],buff[k],format_text_wmem(wmem_packet_scope(), string, 1)); + k,buff[k],buff[k],format_text(wmem_packet_scope(), string, 1)); } k = ( k + 1 ) & 0xffff; n++; @@ -4226,7 +4226,7 @@ execute_next_instruction: if (print_level_3 ) { proto_tree_add_uint_format(udvm_tree, hf_sigcomp_output_value, bytecode_tvb, 0, -1, buff[k], " Output value: %u (0x%x) ASCII(%s) from Addr: %u ,output to dispatcher position %u", - buff[k],buff[k],format_text_wmem(wmem_packet_scope(), string,1), k,output_address); + buff[k],buff[k],format_text(wmem_packet_scope(), string,1), k,output_address); } k = ( k + 1 ) & 0xffff; output_address ++; -- cgit v1.2.3