aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/mcast_stream_dlg.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-04-19 12:06:34 -0700
committerGuy Harris <guy@alum.mit.edu>2014-04-19 19:07:06 +0000
commitc8f7e16b57ed02dd5b4ccba7ec16ac37ae37beb6 (patch)
treeb9f7a5e0451550684ebbf089fefe1b685bbe68e4 /ui/gtk/mcast_stream_dlg.c
parentc03f13bda8be7db381eb52a090af5871706dfb20 (diff)
Some routine name changes.
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/mcast_stream_dlg.c')
-rw-r--r--ui/gtk/mcast_stream_dlg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index 3802ad5d17..dcd6928724 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -179,9 +179,9 @@ mcaststream_on_select_row(GtkTreeSelection *selection, gpointer data _U_)
{
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &list_iter, MC_COL_DATA, &selected_stream_fwd, -1);
g_snprintf(label_text, sizeof(label_text), "Selected: %s:%u -> %s:%u",
- get_addr_name(&(selected_stream_fwd->src_addr)),
+ ep_address_to_display(&(selected_stream_fwd->src_addr)),
selected_stream_fwd->src_port,
- get_addr_name(&(selected_stream_fwd->dest_addr)),
+ ep_address_to_display(&(selected_stream_fwd->dest_addr)),
selected_stream_fwd->dest_port
);
gtk_label_set_text(GTK_LABEL(label_fwd), label_text);
@@ -373,9 +373,9 @@ add_to_list_store(mcast_stream_info_t* strinfo)
/* switch to "C" locale to avoid problems with localized decimal separators
in g_snprintf("%f") functions */
setlocale(LC_NUMERIC, "C");
- data[0] = g_strdup(get_addr_name(&(strinfo->src_addr)));
+ data[0] = g_strdup(ep_address_to_display(&(strinfo->src_addr)));
data[1] = g_strdup_printf("%u", strinfo->src_port);
- data[2] = g_strdup(get_addr_name(&(strinfo->dest_addr)));
+ data[2] = g_strdup(ep_address_to_display(&(strinfo->dest_addr)));
data[3] = g_strdup_printf("%u", strinfo->dest_port);
data[4] = g_strdup_printf("%u", strinfo->npackets);
data[5] = g_strdup_printf("%u /s", strinfo->apackets);