diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-31 07:51:19 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 17:08:47 +0000 |
| commit | 51a30142251e377ec28eb8584c56386c2481d6c0 (patch) | |
| tree | 4a4667a656f60327647805022e5811b6f2c42052 /epan/dissectors/packet-acap.c | |
| parent | 0165b8c40cfd6ca529408862095c1213bdf1ebd5 (diff) | |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-acap.c')
| -rw-r--r-- | epan/dissectors/packet-acap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 30bcc1e02c..60afaa377f 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -124,7 +124,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ */ col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", is_request ? "Request" : "Response", - format_text_wmem(wmem_packet_scope(), line, linelen)); + format_text(wmem_packet_scope(), line, linelen)); if (tree) { ti = proto_tree_add_item(tree, hfi_acap, tvb, offset, -1, @@ -159,10 +159,10 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (tokenlen != 0) { if (is_request) { proto_tree_add_string(reqresp_tree, &hfi_acap_request_tag, tvb, offset, - tokenlen, format_text_wmem(wmem_packet_scope(), line, tokenlen)); + tokenlen, format_text(wmem_packet_scope(), line, tokenlen)); } else { proto_tree_add_string(reqresp_tree, &hfi_acap_response_tag, tvb, offset, - tokenlen, format_text_wmem(wmem_packet_scope(), line, tokenlen)); + tokenlen, format_text(wmem_packet_scope(), line, tokenlen)); } offset += (int)(next_token - line); linelen -= (int)(next_token - line); @@ -175,10 +175,10 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (linelen != 0) { if (is_request) { proto_tree_add_string(reqresp_tree, &hfi_acap_request_data, tvb, offset, - linelen, format_text_wmem(wmem_packet_scope(), line, linelen)); + linelen, format_text(wmem_packet_scope(), line, linelen)); } else { proto_tree_add_string(reqresp_tree, &hfi_acap_response_data, tvb, offset, - linelen, format_text_wmem(wmem_packet_scope(), line, linelen)); + linelen, format_text(wmem_packet_scope(), line, linelen)); } } |