aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation_table.c
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.c
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.c')
-rw-r--r--epan/conversation_table.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/conversation_table.c b/epan/conversation_table.c
index 38171a0527..52e5bf43c8 100644
--- a/epan/conversation_table.c
+++ b/epan/conversation_table.c
@@ -332,12 +332,12 @@ void reset_hostlist_table_data(conv_hash_t *ch)
ch->hashtable=NULL;
}
-const char *get_conversation_address(address *addr, gboolean resolve_names)
+const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names)
{
if (resolve_names) {
- return ep_address_to_display(addr);
+ return address_to_display(allocator, addr);
} else {
- return ep_address_to_str(addr);
+ return address_to_str(allocator, addr);
}
}