From 9cfe67fde61fa16cdf433cb152b5b22949648c64 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Wed, 7 Jan 2015 08:29:35 -0500 Subject: tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann --- epan/tvbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/tvbuff.c') diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 111b0ba0a1..2d9682034c 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -3405,9 +3405,9 @@ tvb_skip_guint8(tvbuff_t *tvb, int offset, const int maxlength, const guint8 ch) * separator. */ gchar * -tvb_bytes_to_ep_str_punct(tvbuff_t *tvb, const gint offset, const gint len, const gchar punct) +tvb_bytes_to_str_punct(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, const gint len, const gchar punct) { - return bytes_to_ep_str_punct(ensure_contiguous(tvb, offset, len), len, punct); + return (gchar*)bytestring_to_str(scope, ensure_contiguous(tvb, offset, len), len, punct); } -- cgit v1.2.1