More name changes.

Add ep_ to routines that may return ephemeral strings.

Change "get_XXX" to "XXX_to_display" if the routine returns a formatted
string if it can't get a name.

Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88
Reviewed-on: https://code.wireshark.org/review/1217
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 15 insertions, 15 deletions

diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index b29d47c435..4aa56e3628 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -1977,13 +1977,13 @@ get_ct_table_address(conversations_table *ct, conv_t *conv, const char **entries
     if(!ct->resolve_names) pt = PT_NONE;
     switch(pt) {
     case(PT_TCP):
-        entries[1] = get_tcp_port(conv->src_port);
+        entries[1] = ep_tcp_port_to_display(conv->src_port);
         break;
     case(PT_UDP):
-        entries[1] = get_udp_port(conv->src_port);
+        entries[1] = ep_udp_port_to_display(conv->src_port);
         break;
     case(PT_SCTP):
-        entries[1] = get_sctp_port(conv->src_port);
+        entries[1] = ep_sctp_port_to_display(conv->src_port);
         break;
     default:
         port=ct_port_to_str(conv->port_type, conv->src_port);
@@ -1998,13 +1998,13 @@ get_ct_table_address(conversations_table *ct, conv_t *conv, const char **entries
 
     switch(pt) {
     case(PT_TCP):
-        entries[3]=get_tcp_port(conv->dst_port);
+        entries[3]=ep_tcp_port_to_display(conv->dst_port);
         break;
     case(PT_UDP):
-        entries[3]=get_udp_port(conv->dst_port);
+        entries[3]=ep_udp_port_to_display(conv->dst_port);
         break;
     case(PT_SCTP):
-        entries[3]=get_sctp_port(conv->dst_port);
+        entries[3]=ep_sctp_port_to_display(conv->dst_port);
         break;
     default:
         port=ct_port_to_str(conv->port_type, conv->dst_port);
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index 615b5cb4a8..1237a2699a 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -241,8 +241,8 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
         hostname1 = get_hostname(ipaddr);
     }
 
-    port0 = get_tcp_port(stats.port[0]);
-    port1 = get_tcp_port(stats.port[1]);
+    port0 = ep_tcp_port_to_display(stats.port[0]);
+    port1 = ep_tcp_port_to_display(stats.port[1]);
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index ec9bb594f1..71b7d54b72 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -261,8 +261,8 @@ follow_tcp_stream_cb(GtkWidget * w _U_, gpointer data _U_)
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
-    port0 = get_tcp_port(stats.port[0]);
-    port1 = get_tcp_port(stats.port[1]);
+    port0 = ep_tcp_port_to_display(stats.port[0]);
+    port1 = ep_tcp_port_to_display(stats.port[1]);
 
     /* Host 0 --> Host 1 */
     if(sc.src_port == stats.port[0]) {
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index d37985919a..4ee7ce9971 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -185,8 +185,8 @@ follow_udp_stream_cb(GtkWidget *w _U_, gpointer data _U_)
         hostname1 = get_hostname(ipaddr);
     }
 
-    port0 = get_udp_port(stats.port[0]);
-    port1 = get_udp_port(stats.port[1]);
+    port0 = ep_udp_port_to_display(stats.port[0]);
+    port1 = ep_udp_port_to_display(stats.port[1]);
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 0ea972f34a..8be7589347 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -631,13 +631,13 @@ get_hostlist_table_address(hostlist_table *hl, hostlist_talker_t *host, const ch
     if(!hl->resolve_names) pt = PT_NONE;
     switch(pt) {
     case(PT_TCP):
-        entries[1] = get_tcp_port(host->port);
+        entries[1] = ep_tcp_port_to_display(host->port);
         break;
     case(PT_UDP):
-        entries[1] = get_udp_port(host->port);
+        entries[1] = ep_udp_port_to_display(host->port);
         break;
     case(PT_SCTP):
-        entries[1] = get_sctp_port(host->port);
+        entries[1] = ep_sctp_port_to_display(host->port);
         break;
     default:
         port=hostlist_port_to_str(host->port_type, host->port);