aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation_table.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-04 21:40:05 -0500
committerMichael Mann <mmann78@netscape.net>2015-01-05 13:55:04 +0000
commit22b4ec91c006fec65e655ccbb0dbbc32438f820b (patch)
tree033dc9de28b8a79550a4dd769fcfb249df4be38c /epan/conversation_table.h
parent9a7318a184e25e08d1c8449e3f826e0a5c66ca3b (diff)
Replace ep_display_to_address with wmem equivalent display_to_address.
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/conversation_table.h')
-rw-r--r--epan/conversation_table.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/conversation_table.h b/epan/conversation_table.h
index b36184717f..536a237487 100644
--- a/epan/conversation_table.h
+++ b/epan/conversation_table.h
@@ -257,7 +257,7 @@ WS_DLL_PUBLIC void dissector_hostlist_init(const char *opt_arg, void* userdata);
* @param resolve_names Enable name resolution.
* @return An ep_allocated string representing the address.
*/
-WS_DLL_PUBLIC const char *get_conversation_address(address *addr, gboolean resolve_names);
+WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names);
/** Get the string representation of a port.
*