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-pvfs2.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-pvfs2.c')
| -rw-r--r-- | epan/dissectors/packet-pvfs2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 462af09a39..be9e09e98f 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -893,7 +893,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, size_t string_buffer_size = 0; char *string_buffer_temp; - formatted = format_text((guint8 *)string_buffer, + formatted = format_text_wmem(wmem_packet_scope(), (guint8 *)string_buffer, (int)strlen(string_buffer)); string_buffer_size = strlen(formatted) + 12 + 1; @@ -917,9 +917,8 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, } } else { if (string_data) { - string_buffer_print = - wmem_strdup(wmem_packet_scope(), format_text((guint8 *) string_buffer, - (int)strlen(string_buffer))); + string_buffer_print = format_text_wmem(wmem_packet_scope(), (guint8 *) string_buffer, + (int)strlen(string_buffer)); } else { string_buffer_print="<DATA>"; } |