From 4df2c4abd920cc579c6f5691670d4fc0e75c130a Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 1 Jan 2005 12:49:54 +0000 Subject: Make the signatures of functions passed to "register_tap_listener()" match what "register_tap_listener()" expects (rather than squelching warnings about the differences by casting function pointers to "void *"). Make static some functions not used outside the module in which they're defined. svn path=/trunk/; revision=12913 --- gtk/conversations_eth.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gtk/conversations_eth.c') diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c index 681b64657e..4196f25124 100644 --- a/gtk/conversations_eth.c +++ b/gtk/conversations_eth.c @@ -41,9 +41,9 @@ static int -eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) +eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { - eth_hdr *ehdr=vip; + const eth_hdr *ehdr=vip; add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_ETHER, PT_NONE); @@ -63,7 +63,7 @@ eth_conversation_init(char *optarg) filter=NULL; } - init_conversation_table(TRUE, "Ethernet", "eth", filter, (void *)eth_conversation_packet); + init_conversation_table(TRUE, "Ethernet", "eth", filter, eth_conversation_packet); } @@ -83,6 +83,5 @@ register_tap_listener_eth_conversation(void) register_tap_menu_item("Ethernet", REGISTER_TAP_GROUP_CONVERSATION_LIST, eth_endpoints_cb, NULL, NULL, NULL); - register_conversation_table(TRUE, "Ethernet", "eth", NULL /*filter*/, (void *)eth_conversation_packet); + register_conversation_table(TRUE, "Ethernet", "eth", NULL /*filter*/, eth_conversation_packet); } - -- cgit v1.2.3