diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-05 11:12:08 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-06 07:38:18 +0000 |
| commit | 55de46f317b5e3aba957f4aa44e242aea0d29dfc (patch) | |
| tree | 3e5c8a3d17ef272b098fc7db62b6f56ab0b96f78 /ui/gtk/capture_if_dlg.c | |
| parent | 124272ec097852c0c0efa587cb1cb1bf8047ff73 (diff) | |
Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/capture_if_dlg.c')
| -rw-r--r-- | ui/gtk/capture_if_dlg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 0bbf695a80..9188f85577 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -468,7 +468,7 @@ set_ip_addr_label(GSList *addr_list, GtkWidget *ip_lb, guint selected_ip_addr) GSList *curr_addr; if_addr_t *addr; address addr_address; - const gchar *addr_str = NULL; + char *addr_str = NULL; curr_addr = g_slist_nth(addr_list, selected_ip_addr); if (curr_addr) { @@ -477,12 +477,12 @@ set_ip_addr_label(GSList *addr_list, GtkWidget *ip_lb, guint selected_ip_addr) case IF_AT_IPv4: SET_ADDRESS(&addr_address, AT_IPv4, 4, &addr->addr.ip4_addr); - addr_str = ep_address_to_str(&addr_address); + addr_str = (char*)address_to_str(NULL, &addr_address); break; case IF_AT_IPv6: SET_ADDRESS(&addr_address, AT_IPv6, 16, addr->addr.ip6_addr); - addr_str = ep_address_to_str(&addr_address); + addr_str = (char*)address_to_str(NULL, &addr_address); break; default: @@ -496,6 +496,7 @@ set_ip_addr_label(GSList *addr_list, GtkWidget *ip_lb, guint selected_ip_addr) } else { gtk_label_set_text(GTK_LABEL(ip_lb), "none"); } + wmem_free(NULL, addr_str); g_object_set_data(G_OBJECT(ip_lb), CAPTURE_IF_SELECTED_IP_ADDR, GINT_TO_POINTER(selected_ip_addr)); return addr_str; |