diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 08:29:35 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:05:35 +0000 |
| commit | 9cfe67fde61fa16cdf433cb152b5b22949648c64 (patch) | |
| tree | 5f61b4cf38f1c1d90f73d90092de65194be60adb /epan/tvbuff.c | |
| parent | 493f03b4200f96f45fadf3302b1d3bfb5a95b409 (diff) | |
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 <mmann78@netscape.net>
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |