From 24d546353be7cf64787c4e6690f0bb5cedf43f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 26 Nov 2015 01:29:36 +0000 Subject: pcapng: Fix ISO C forbids conversion [-Wpedantic] pcapng.c:461:31: warning: ISO C forbids passing argument 3 of 'g_hash_table_insert' between function pointer and 'void *' [-Wpedantic] pcapng.c:1404:32: warning: ISO C forbids conversion of object pointer to function pointer type [-Wpedantic] pcapng.c:1918:32: warning: ISO C forbids conversion of object pointer to function pointer type [-Wpedantic] Change-Id: I535633098cc5d37442732dd92e8c9d3cda36631a Reviewed-on: https://code.wireshark.org/review/12161 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- wiretap/pcapng_module.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/pcapng_module.h') diff --git a/wiretap/pcapng_module.h b/wiretap/pcapng_module.h index aa7f9c40c9..7cd33e356b 100644 --- a/wiretap/pcapng_module.h +++ b/wiretap/pcapng_module.h @@ -58,7 +58,7 @@ void register_pcapng_block_type_handler(guint block_type, block_reader read, /* * Handler routine for pcap-ng option type. */ -typedef gboolean (*option_handler)(gboolean, guint, guint8 *, int *, gchar **); +typedef gboolean (*option_handler_fn)(gboolean, guint, guint8 *, int *, gchar **); /* * Register a handler for a pcap-ng option code for a particular block @@ -66,7 +66,7 @@ typedef gboolean (*option_handler)(gboolean, guint, guint8 *, int *, gchar **); */ WS_DLL_PUBLIC void register_pcapng_option_handler(guint block_type, guint option_code, - option_handler handle); + option_handler_fn hfunc); #endif /* __PCAP_MODULE_H__ */ -- cgit v1.2.1