diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 16:24:17 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-08 05:32:32 +0000 |
| commit | 22096781499c7159ff504f7baa743d295aad06bc (patch) | |
| tree | db03b06970119f83d9b33c2920236d398e3a9ca1 /epan/addr_resolv.c | |
| parent | 907d145f86dd4fb219dcb5b2efcac106bc708de7 (diff) | |
| download | wireshark-22096781499c7159ff504f7baa743d295aad06bc.tar.gz | |
ep_<protocol>_port_to_display -> <protocol>_port_to_display
Adjust any other ep_ related APIs related to the transition.
Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c
Reviewed-on: https://code.wireshark.org/review/6388
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index bbc1d13675..7221ee34b2 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -601,9 +601,9 @@ parse_services_file(const char * path) * unsigned integer to ascii */ static gchar * -ep_utoa(guint port) +wmem_utoa(wmem_allocator_t *allocator, guint port) { - gchar *bp = (gchar *)ep_alloc(MAXNAMELEN); + gchar *bp = (gchar *)wmem_alloc(allocator, MAXNAMELEN); /* XXX, guint32_to_str() ? */ guint32_to_str_buf(port, bp, MAXNAMELEN); @@ -2834,52 +2834,52 @@ manually_resolve_cleanup(void) } gchar * -ep_udp_port_to_display(guint port) +udp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_UDP); -} /* ep_udp_port_to_display */ +} /* udp_port_to_display */ gchar * -ep_dccp_port_to_display(guint port) +dccp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_DCCP); -} /* ep_dccp_port_to_display */ +} /* dccp_port_to_display */ gchar * -ep_tcp_port_to_display(guint port) +tcp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_TCP); -} /* ep_tcp_port_to_display */ +} /* tcp_port_to_display */ gchar * -ep_sctp_port_to_display(guint port) +sctp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_SCTP); -} /* ep_sctp_port_to_display */ +} /* sctp_port_to_display */ const gchar * address_to_display(wmem_allocator_t *allocator, const address *addr) |