diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/to_str.c | 4 | ||||
| -rw-r--r-- | epan/to_str.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index e3be688c84..9ef29fe01d 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -200,7 +200,7 @@ bytestring_to_str(wmem_allocator_t *scope, const guint8 *ad, const guint32 len, } char * -bytes_to_str(wmem_allocator_t *allocator, const guint8 *bd, int bd_len) +bytes_to_str(wmem_allocator_t *scope, const guint8 *bd, int bd_len) { gchar *cur; gchar *cur_ptr; @@ -209,7 +209,7 @@ bytes_to_str(wmem_allocator_t *allocator, const guint8 *bd, int bd_len) if (!bd) REPORT_DISSECTOR_BUG("Null pointer passed to bytes_to_str()"); - cur=(gchar *)wmem_alloc(allocator, MAX_BYTE_STR_LEN+3+1); + cur=(gchar *)wmem_alloc(scope, MAX_BYTE_STR_LEN+3+1); if (bd_len <= 0) { cur[0] = '\0'; return cur; } if (bd_len > MAX_BYTE_STR_LEN/2) { /* bd_len > 24 */ diff --git a/epan/to_str.h b/epan/to_str.h index a57f15e19a..b7056c5752 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -138,7 +138,7 @@ WS_DLL_PUBLIC gchar* tvb_address_var_to_str(wmem_allocator_t *scope, tvbuff_t *t * @param bd_len The length of the byte array * @return A pointer to the formatted string */ -WS_DLL_PUBLIC char *bytes_to_str(wmem_allocator_t *allocator, const guint8 *bd, int bd_len); +WS_DLL_PUBLIC char *bytes_to_str(wmem_allocator_t *scope, const guint8 *bd, int bd_len); /** Turn an array of bytes into a string showing the bytes in hex, * separated by a punctuation character. |