From fa1f2bc26c969481f370aa58f5a40061e5802ab3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 7 Feb 2018 19:18:18 +0000 Subject: [PATCH] libnm/vpn-plugin: avoid bad function pointer type casts This makes GCC 8.0 unhappy and it is probably right about that -- it's more difficult to get things wrong when the function prototypes actually match. (cherry picked from commit 7f7207f36bc16cd5dc4550b6307efd72c9d623ee) (cherry picked from commit 17b488cfd569bb9039dd5bb6d2c78fed7a6a3f4e) --- libnm-glib/nm-vpn-plugin.c | 10 +++++++++- libnm/nm-vpn-plugin-old.c | 10 +++++++++- libnm/nm-vpn-service-plugin.c | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 4c4c3161c9..316939ca93 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -686,10 +686,18 @@ impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, /*****************************************************************************/ +static void +_emit_quit (gpointer data, gpointer user_data) +{ + NMVPNPlugin *plugin = data; + + nm_vpn_plugin_emit_quit (plugin); +} + static void sigterm_handler (int signum) { - g_slist_foreach (active_plugins, (GFunc) nm_vpn_plugin_emit_quit, NULL); + g_slist_foreach (active_plugins, _emit_quit, NULL); } static void diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 2b5922b925..897f6d408d 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -904,10 +904,18 @@ impl_vpn_plugin_old_set_failure (NMVpnPluginOld *plugin, /*****************************************************************************/ +static void +_emit_quit (gpointer data, gpointer user_data) +{ + NMVpnPluginOld *plugin = data; + + nm_vpn_plugin_old_emit_quit (plugin); +} + static void sigterm_handler (int signum) { - g_slist_foreach (active_plugins, (GFunc) nm_vpn_plugin_old_emit_quit, NULL); + g_slist_foreach (active_plugins, _emit_quit, NULL); } static void diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 31e1295488..e4b1df48bd 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -926,10 +926,18 @@ impl_vpn_service_plugin_set_failure (NMVpnServicePlugin *plugin, /*****************************************************************************/ +static void +_emit_quit (gpointer data, gpointer user_data) +{ + NMVpnServicePlugin *plugin = data; + + nm_vpn_service_plugin_emit_quit (plugin); +} + static void sigterm_handler (int signum) { - g_slist_foreach (active_plugins, (GFunc) nm_vpn_service_plugin_emit_quit, NULL); + g_slist_foreach (active_plugins, _emit_quit, NULL); } static void