From ce8477a3ed19db30034fb798ef6c951e772a9b1d Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 30 Aug 2003 01:05:03 +0000 Subject: [PATCH] step 3 in endpoint talkers cleanup get rid of the draw_packets wrapper in the individual endpoint files svn path=/trunk/; revision=8319 --- gtk/endpoint_talkers_eth.c | 13 ++----------- gtk/endpoint_talkers_fc.c | 13 ++----------- gtk/endpoint_talkers_fddi.c | 13 ++----------- gtk/endpoint_talkers_ip.c | 13 ++----------- gtk/endpoint_talkers_ipx.c | 13 ++----------- gtk/endpoint_talkers_tcpip.c | 13 ++----------- gtk/endpoint_talkers_tr.c | 13 ++----------- gtk/endpoint_talkers_udpip.c | 13 ++----------- 8 files changed, 16 insertions(+), 88 deletions(-) diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c index ec83e8e601..121369c704 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.8 2003/08/30 00:53:14 sahlberg Exp $ + * $Id: endpoint_talkers_eth.c,v 1.9 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -59,15 +59,6 @@ eth_talkers_reset(void *pit) } -static void -eth_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int eth_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -128,7 +119,7 @@ gtk_eth_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("eth", talkers, filter, eth_talkers_reset, eth_talkers_packet, eth_talkers_draw); + error_string=register_tap_listener("eth", talkers, filter, eth_talkers_reset, eth_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c index 9afea711f3..474c364b1e 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.8 2003/08/30 00:53:14 sahlberg Exp $ + * $Id: endpoint_talkers_fc.c,v 1.9 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -59,15 +59,6 @@ fc_talkers_reset(void *pit) } -static void -fc_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int fc_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -128,7 +119,7 @@ gtk_fc_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("fc", talkers, filter, fc_talkers_reset, fc_talkers_packet, fc_talkers_draw); + error_string=register_tap_listener("fc", talkers, filter, fc_talkers_reset, fc_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c index a86a21dccb..997a8c543b 100644 --- a/gtk/endpoint_talkers_fddi.c +++ b/gtk/endpoint_talkers_fddi.c @@ -1,7 +1,7 @@ /* endpoint_talkers_fddi.c * endpoint_talkers_fddi 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_fddi.c,v 1.3 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_fddi.c,v 1.4 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -60,15 +60,6 @@ fddi_talkers_reset(void *pit) } -static void -fddi_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int fddi_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -129,7 +120,7 @@ gtk_fddi_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("fddi", talkers, filter, fddi_talkers_reset, fddi_talkers_packet, fddi_talkers_draw); + error_string=register_tap_listener("fddi", talkers, filter, fddi_talkers_reset, fddi_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c index 4a33dc39af..01acee87a6 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.9 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_ip.c,v 1.10 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -59,15 +59,6 @@ ip_talkers_reset(void *pit) } -static void -ip_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int ip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -127,7 +118,7 @@ gtk_ip_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("ip", talkers, filter, ip_talkers_reset, ip_talkers_packet, ip_talkers_draw); + error_string=register_tap_listener("ip", talkers, filter, ip_talkers_reset, ip_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c index cef29e5fd4..b8f3bbf702 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.7 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_ipx.c,v 1.8 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -59,15 +59,6 @@ ipx_talkers_reset(void *pit) } -static void -ipx_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int ipx_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -128,7 +119,7 @@ gtk_ipx_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("ipx", talkers, filter, ipx_talkers_reset, ipx_talkers_packet, ipx_talkers_draw); + error_string=register_tap_listener("ipx", talkers, filter, ipx_talkers_reset, ipx_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c index 40fd677c03..baa1961343 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.10 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_tcpip.c,v 1.11 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -75,15 +75,6 @@ tcpip_talkers_reset(void *pit) } -static void -tcpip_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int tcpip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -147,7 +138,7 @@ gtk_tcpip_talkers_init(char *optarg) init_ett_table(talkers, vbox, tcpip_port_to_str, filter_names); - error_string=register_tap_listener("tcp", talkers, filter, tcpip_talkers_reset, tcpip_talkers_packet, tcpip_talkers_draw); + error_string=register_tap_listener("tcp", talkers, filter, tcpip_talkers_reset, tcpip_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c index 7d5c30f96a..bb3b6887be 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.9 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_tr.c,v 1.10 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -58,15 +58,6 @@ tr_talkers_reset(void *pit) } -static void -tr_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int tr_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -127,7 +118,7 @@ gtk_tr_talkers_init(char *optarg) init_ett_table(talkers, vbox, NULL, filter_names); - error_string=register_tap_listener("tr", talkers, filter, tr_talkers_reset, tr_talkers_packet, tr_talkers_draw); + error_string=register_tap_listener("tr", talkers, filter, tr_talkers_reset, tr_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c index 291f3e98e3..560ade15cb 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.10 2003/08/30 00:53:15 sahlberg Exp $ + * $Id: endpoint_talkers_udpip.c,v 1.11 2003/08/30 01:05:03 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -76,15 +76,6 @@ udpip_talkers_reset(void *pit) } -static void -udpip_talkers_draw(void *pit) -{ - endpoints_table *talkers=(endpoints_table *)pit; - - draw_ett_table_data(talkers); -} - - static int udpip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { @@ -147,7 +138,7 @@ gtk_udpip_talkers_init(char *optarg) init_ett_table(talkers, vbox, udpip_port_to_str, filter_names); - error_string=register_tap_listener("udp", talkers, filter, udpip_talkers_reset, udpip_talkers_packet, udpip_talkers_draw); + error_string=register_tap_listener("udp", talkers, filter, udpip_talkers_reset, udpip_talkers_packet, (void *)draw_ett_table_data); if(error_string){ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str); g_string_free(error_string, TRUE);