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>

1 files changed, 1 insertions, 31 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index f78b6f7044..e352952cd9 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2882,28 +2882,7 @@ ep_sctp_port_to_display(guint port)
 } /* ep_sctp_port_to_display */
 
 const gchar *
-ep_address_to_display(const address *addr)
-{
-    const gchar *result;
-
-    result = solve_address_to_name(addr);
-
-    if (result != NULL)
-        return result;
-
-    /* if it gets here, either it is of type AT_NONE, */
-    /* or it should be solvable in address_to_str -unless addr->type is wrongly defined */
-
-    if (addr->type == AT_NONE){
-        return "NONE";
-    }
-
-    /* We need an ephemeral allocated string */
-    return ep_address_to_str(addr);
-}
-
-const gchar *
-wmem_address_to_display(wmem_allocator_t *allocator, const address *addr)
+address_to_display(wmem_allocator_t *allocator, const address *addr)
 {
     gchar *str = NULL;
     const gchar *result = solve_address_to_name(addr);
@@ -2955,15 +2934,6 @@ get_addr_name(const address *addr)
     }
 }
 
-void
-get_addr_name_buf(const address *addr, gchar *buf, gsize size)
-{
-    const gchar *result = ep_address_to_display(addr);
-
-    g_strlcpy(buf, result, size);
-} /* get_addr_name_buf */
-
-
 gchar *
 get_ether_name(const guint8 *addr)
 {