From 7540493b2075aac13761e44c6c47797897140418 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 24 Aug 2003 22:34:32 +0000 Subject: [PATCH] Get rid of the wrappers around "address_to_str()". svn path=/trunk/; revision=8245 --- gtk/endpoint_talkers_eth.c | 11 ++--------- gtk/endpoint_talkers_fc.c | 11 ++--------- gtk/endpoint_talkers_ip.c | 11 ++--------- gtk/endpoint_talkers_ipx.c | 11 ++--------- gtk/endpoint_talkers_tcpip.c | 11 ++--------- gtk/endpoint_talkers_tr.c | 11 ++--------- gtk/endpoint_talkers_udpip.c | 11 ++--------- 7 files changed, 14 insertions(+), 63 deletions(-) diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c index c6dd3c64e6..fb277f6a19 100644 --- a/gtk/endpoint_talkers_eth.c +++ b/gtk/endpoint_talkers_eth.c @@ -1,7 +1,7 @@ /* endpoint_talkers_eth.c * endpoint_talkers_eth 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_eth.c,v 1.2 2003/08/24 03:00:11 sahlberg Exp $ + * $Id: endpoint_talkers_eth.c,v 1.3 2003/08/24 22:34:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(eth_talkers); } - -static char * -eth_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static void eth_talkers_reset(void *pit) { @@ -141,7 +134,7 @@ gtk_eth_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(eth_talkers->win); - init_ett_table(ð_talkers->talkers, vbox, eth_address_to_str, NULL); + init_ett_table(ð_talkers->talkers, vbox, address_to_str, NULL); error_string=register_tap_listener("eth", eth_talkers, filter, eth_talkers_reset, eth_talkers_packet, eth_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c index 1e6d4035db..7fce89d516 100644 --- a/gtk/endpoint_talkers_fc.c +++ b/gtk/endpoint_talkers_fc.c @@ -1,7 +1,7 @@ /* endpoint_talkers_fc.c * endpoint_talkers_fc 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_fc.c,v 1.2 2003/08/24 03:00:11 sahlberg Exp $ + * $Id: endpoint_talkers_fc.c,v 1.3 2003/08/24 22:34:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(fc_talkers); } - -static char * -fc_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static void fc_talkers_reset(void *pit) { @@ -141,7 +134,7 @@ gtk_fc_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(fc_talkers->win); - init_ett_table(&fc_talkers->talkers, vbox, fc_address_to_str, NULL); + init_ett_table(&fc_talkers->talkers, vbox, address_to_str, NULL); error_string=register_tap_listener("fc", fc_talkers, filter, fc_talkers_reset, fc_talkers_packet, fc_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c index bbdee9a779..9392472454 100644 --- a/gtk/endpoint_talkers_ip.c +++ b/gtk/endpoint_talkers_ip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_ip.c * endpoint_talkers_ip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_ip.c,v 1.3 2003/08/24 02:50:32 sahlberg Exp $ + * $Id: endpoint_talkers_ip.c,v 1.4 2003/08/24 22:34:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(ip_talkers); } - -static char * -ipv4_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static void ip_talkers_reset(void *pit) { @@ -141,7 +134,7 @@ gtk_ip_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(ip_talkers->win); - init_ett_table(&ip_talkers->talkers, vbox, ipv4_address_to_str, NULL); + init_ett_table(&ip_talkers->talkers, vbox, address_to_str, NULL); error_string=register_tap_listener("ip", ip_talkers, filter, ip_talkers_reset, ip_talkers_packet, ip_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c index 9828b631e2..624e23ac3e 100644 --- a/gtk/endpoint_talkers_ipx.c +++ b/gtk/endpoint_talkers_ipx.c @@ -1,7 +1,7 @@ /* endpoint_talkers_ipx.c * endpoint_talkers_ipx 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_ipx.c,v 1.1 2003/08/24 05:39:05 sahlberg Exp $ + * $Id: endpoint_talkers_ipx.c,v 1.2 2003/08/24 22:34:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(ipx_talkers); } - -static char * -ipx_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static void ipx_talkers_reset(void *pit) { @@ -141,7 +134,7 @@ gtk_ipx_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(ipx_talkers->win); - init_ett_table(&ipx_talkers->talkers, vbox, ipx_address_to_str, NULL); + init_ett_table(&ipx_talkers->talkers, vbox, address_to_str, NULL); error_string=register_tap_listener("ipx", ipx_talkers, filter, ipx_talkers_reset, ipx_talkers_packet, ipx_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c index 985b2e9bad..66cd51ed15 100644 --- a/gtk/endpoint_talkers_tcpip.c +++ b/gtk/endpoint_talkers_tcpip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_tcpip.c * endpoint_talkers_tcpip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_tcpip.c,v 1.4 2003/08/24 02:50:32 sahlberg Exp $ + * $Id: endpoint_talkers_tcpip.c,v 1.5 2003/08/24 22:34:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(tcpip_talkers); } - -static char * -tcpip_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static char * tcpip_port_to_str(guint32 port) { @@ -158,7 +151,7 @@ gtk_tcpip_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(tcpip_talkers->win); - init_ett_table(&tcpip_talkers->talkers, vbox, tcpip_address_to_str, tcpip_port_to_str); + init_ett_table(&tcpip_talkers->talkers, vbox, address_to_str, tcpip_port_to_str); error_string=register_tap_listener("tcp", tcpip_talkers, filter, tcpip_talkers_reset, tcpip_talkers_packet, tcpip_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c index f3d3e70a9b..36918ac557 100644 --- a/gtk/endpoint_talkers_tr.c +++ b/gtk/endpoint_talkers_tr.c @@ -1,7 +1,7 @@ /* endpoint_talkers_tr.c * endpoint_talkers_tr 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_tr.c,v 1.3 2003/08/24 03:00:11 sahlberg Exp $ + * $Id: endpoint_talkers_tr.c,v 1.4 2003/08/24 22:34:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(tr_talkers); } - -static char * -tr_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static void tr_talkers_reset(void *pit) { @@ -141,7 +134,7 @@ gtk_tr_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(tr_talkers->win); - init_ett_table(&tr_talkers->talkers, vbox, tr_address_to_str, NULL); + init_ett_table(&tr_talkers->talkers, vbox, address_to_str, NULL); error_string=register_tap_listener("tr", tr_talkers, filter, tr_talkers_reset, tr_talkers_packet, tr_talkers_draw); if(error_string){ diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c index cec54cf637..b02aafaa41 100644 --- a/gtk/endpoint_talkers_udpip.c +++ b/gtk/endpoint_talkers_udpip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_udpip.c * endpoint_talkers_udpip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_udpip.c,v 1.4 2003/08/24 02:50:32 sahlberg Exp $ + * $Id: endpoint_talkers_udpip.c,v 1.5 2003/08/24 22:34:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,13 +67,6 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) g_free(udpip_talkers); } - -static char * -udpip_address_to_str(address *addr) -{ - return address_to_str(addr); -} - static char * udpip_port_to_str(guint32 port) { @@ -158,7 +151,7 @@ gtk_udpip_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(udpip_talkers->win); - init_ett_table(&udpip_talkers->talkers, vbox, udpip_address_to_str, udpip_port_to_str); + init_ett_table(&udpip_talkers->talkers, vbox, address_to_str, udpip_port_to_str); error_string=register_tap_listener("udp", udpip_talkers, filter, udpip_talkers_reset, udpip_talkers_packet, udpip_talkers_draw); if(error_string){