summaryrefslogtreecommitdiff
path: root/epan/strutil.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-01-31 08:29:53 -0500
committerMichael Mann <mmann78@netscape.net>2017-01-31 17:08:54 +0000
commit148fb1acf46e205801e4e06f4f3f755a13bd2a48 (patch)
tree7fac7a3cf2e986a2ac22f9637f6b4fdd73aae392 /epan/strutil.h
parent51a30142251e377ec28eb8584c56386c2481d6c0 (diff)
downloadwireshark-148fb1acf46e205801e4e06f4f3f755a13bd2a48.tar.gz
Add wmem allocator parameter to format_uri
Change-Id: Ic6de84a37b501e9c62a7d37071b2b081a1a1dd50 Reviewed-on: https://code.wireshark.org/review/19885 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/strutil.h')
-rw-r--r--epan/strutil.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/strutil.h b/epan/strutil.h
index d7a7560b32..6a0f1588d6 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -158,6 +158,7 @@ gboolean uri_str_to_bytes(const char *uri_str, GByteArray *bytes);
/** Turn a byte array into an RFC 3986 percent-encoded string.
*
+ * @param allocator The wmem scope
* @param bytes The GByteArray that will receive the bytes. This
* must be initialized by the caller.
* @param reserved_chars Normally the "gen-delims" and "sub-delims"
@@ -170,7 +171,7 @@ gboolean uri_str_to_bytes(const char *uri_str, GByteArray *bytes);
* @see uri_str_to_bytes(), format_text(), isprint()
*/
WS_DLL_PUBLIC
-const gchar* format_uri(const GByteArray *bytes, const gchar *reserved_chars);
+gchar* format_uri(wmem_allocator_t* allocator, const GByteArray *bytes, const gchar *reserved_chars);
/** Turn a OID string representation (dot notation) into a byte array.
*