to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumen...

Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c
Reviewed-on: https://code.wireshark.org/review/6475
Reviewed-by: Michael Mann <mmann78@netscape.net>

diff --git a/epan/to_str.c b/epan/to_str.c
index e3be688c84637c673e003ec82f56ddc52d99aa98..9ef29fe01d6e8306f5b1f9bdd068882ffad9b91d 100644 (file)
--- 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 a57f15e19a47ef9c7795a3d82abac77652a36dc9..b7056c57527bca6c76171e8e49a18224009c05da 100644 (file)
--- 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.