diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-29 21:53:49 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 02:26:35 +0000 |
| commit | d802b5b0ec8e10fbf64f6c76815b759323029bb4 (patch) | |
| tree | 2071ff718141347ff02c8dc02aafb9090e8fc5e1 /epan/dissectors/packet-acap.c | |
| parent | 60a877167f05644a5a75676798084027accd1c3d (diff) | |
| download | wireshark-d802b5b0ec8e10fbf64f6c76815b759323029bb4.tar.gz | |
Add format_text_wmem.
This allows for a wmem_allocator for users of format_text who want
it (dissectors for wmem_packet_scope()). This lessens the role of
current format_text functionality in hopes that it will eventually
be replaced.
Change-Id: I970557a65e32aa79634a3fcc654ab641b871178e
Reviewed-on: https://code.wireshark.org/review/19855
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 209220c1a1..30bcc1e02c 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(line, linelen)); + format_text_wmem(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(line, tokenlen)); + tokenlen, format_text_wmem(wmem_packet_scope(), line, tokenlen)); } else { proto_tree_add_string(reqresp_tree, &hfi_acap_response_tag, tvb, offset, - tokenlen, format_text(line, tokenlen)); + tokenlen, format_text_wmem(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(line, linelen)); + linelen, format_text_wmem(wmem_packet_scope(), line, linelen)); } else { proto_tree_add_string(reqresp_tree, &hfi_acap_response_data, tvb, offset, - linelen, format_text(line, linelen)); + linelen, format_text_wmem(wmem_packet_scope(), line, linelen)); } } |