diff options
author | Hadriel Kaplan <hadriel@128technology.com> | 2014-12-29 00:21:15 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-01-04 21:02:38 +0000 |
commit | fac8356610fadf488ff92c5a22e5177bb33a2511 (patch) | |
tree | af8a1ceec7eb91c5a6a5e6e2ac14621425125e65 /epan/addr_resolv.h | |
parent | 5653fcedca8491829d6d6ce480e7fba13ff801d7 (diff) |
Make all Lua code use wmem not emem
Changed all remaining code in wslua that was using emem, to use wmem or
simpler methods.
Bug: 9927
Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55
Reviewed-on: https://code.wireshark.org/review/6109
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/addr_resolv.h')
-rw-r--r-- | epan/addr_resolv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 0f92484f5b..140cc8703c 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -144,6 +144,13 @@ WS_DLL_PUBLIC gchar *ep_sctp_port_to_display(guint port); WS_DLL_PUBLIC const gchar *ep_address_to_display(const address *addr); +/* + * wmem_address_to_display is the same as ep_address_to_display above, but + * using the wmem scope for memory management. + */ +WS_DLL_PUBLIC +const gchar *wmem_address_to_display(wmem_allocator_t *allocator, const address *addr); + /* get_addr_name_buf solves an address in the same way as ep_address_to_display above */ /* The difference is that get_addr_name_buf takes as input a buffer, into which it puts */ /* the result which is always NUL ('\0') terminated. The buffer should be large enough to */ |