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-bencode.c | |
| parent | 60a877167f05644a5a75676798084027accd1c3d (diff) | |
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-bencode.c')
| -rw-r--r-- | epan/dissectors/packet-bencode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c index bb44bc27ea..e24c32b66c 100644 --- a/epan/dissectors/packet-bencode.c +++ b/epan/dissectors/packet-bencode.c @@ -84,13 +84,11 @@ static int dissect_bencoding_str(tvbuff_t *tvb, packet_info *pinfo, if (treeadd == 1) { proto_item_append_text(ti, " Key: %s", - format_text((guchar *)tvb_memdup(wmem_packet_scope(), - tvb, offset + used, stringlen), stringlen)); + tvb_format_text(tvb, offset + used, stringlen)); } if (treeadd == 2) { proto_item_append_text(ti, " Value: %s", - format_text((guchar *)tvb_memdup(wmem_packet_scope(), - tvb, offset + used, stringlen), stringlen)); + tvb_format_text(tvb, offset + used, stringlen)); } } return used + stringlen; |