diff options
| -rw-r--r-- | caputils/iface_monitor.c | 2 | ||||
| -rw-r--r-- | epan/conversation_table.c | 4 | ||||
| -rw-r--r-- | epan/plugin_if.c | 2 | ||||
| -rw-r--r-- | epan/proto.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c index 54c9d6045b..dcadf0b49f 100644 --- a/caputils/iface_monitor.c +++ b/caputils/iface_monitor.c @@ -149,7 +149,7 @@ iface_mon_start(iface_mon_cb cb) nl_socket_disable_seq_check(iface_mon_sock); - nl_socket_modify_cb(iface_mon_sock, NL_CB_VALID, NL_CB_CUSTOM, iface_mon_handler, cb); + nl_socket_modify_cb(iface_mon_sock, NL_CB_VALID, NL_CB_CUSTOM, iface_mon_handler, (void *)cb); if (nl_connect(iface_mon_sock, NETLINK_ROUTE)) { fprintf(stderr, "Failed to connect to generic netlink.\n"); diff --git a/epan/conversation_table.c b/epan/conversation_table.c index 1aaeabc4b3..a41d49e3c7 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -173,7 +173,7 @@ set_conv_gui_data(gpointer data, gpointer user_data) void conversation_table_set_gui_info(conv_gui_init_cb init_cb) { - g_slist_foreach(registered_ct_tables, set_conv_gui_data, init_cb); + g_slist_foreach(registered_ct_tables, set_conv_gui_data, (gpointer)init_cb); } static void @@ -197,7 +197,7 @@ set_host_gui_data(gpointer data, gpointer user_data) void hostlist_table_set_gui_info(host_gui_init_cb init_cb) { - g_slist_foreach(registered_ct_tables, set_host_gui_data, init_cb); + g_slist_foreach(registered_ct_tables, set_host_gui_data, (gpointer)init_cb); } void conversation_table_iterate_tables(GFunc func, gpointer user_data) diff --git a/epan/plugin_if.c b/epan/plugin_if.c index 4757dd7b25..eb0ad03f5f 100644 --- a/epan/plugin_if.c +++ b/epan/plugin_if.c @@ -293,7 +293,7 @@ extern void plugin_if_register_gui_cb(plugin_if_callback_t actionType, plugin_if plugin_if_init_hashtable(); if ( ! g_hash_table_lookup_extended(plugin_if_callback_functions, key, NULL, NULL ) ) - g_hash_table_insert(plugin_if_callback_functions, key, callback); + g_hash_table_insert(plugin_if_callback_functions, key, (gpointer)callback); } /* diff --git a/epan/proto.c b/epan/proto.c index 149d441660..5c66291985 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -880,7 +880,7 @@ proto_register_prefix(const char *prefix, prefix_initializer_t pi ) { prefixes = g_hash_table_new(prefix_hash, prefix_equal); } - g_hash_table_insert(prefixes, (gpointer)prefix, pi); + g_hash_table_insert(prefixes, (gpointer)prefix, (gpointer)pi); } /* helper to call all prefix initializers */ |