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-pop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-pop.c') diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index 54185d86db..93f0f97701 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -192,7 +192,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } else col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", is_request ? "C" : "S", - format_text_wmem(wmem_packet_scope(), line, linelen)); + format_text(wmem_packet_scope(), line, linelen)); ti = proto_tree_add_item(tree, proto_pop, tvb, offset, -1, ENC_NA); pop_tree = proto_item_add_subtree(ti, ett_pop); -- cgit v1.2.3