From 9545a8bc341c4a326a2115b35e8b53ea6376cc31 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 19 Mar 2018 13:12:28 +0100 Subject: [PATCH] all: don't explicitly cast destroy function for g_clear_pointer() The g_clear_pointer() macro already contains a cast to GDestroyNotify. No need to do it ourself. In fact, with the cast, this only works with the particular g_clear_pointer() implementation, that first assigns the destroy function to a local variable. See-also: https://bugzilla.gnome.org/show_bug.cgi?id=674634#c52 --- src/devices/wwan/nm-modem-broadband.c | 2 +- src/settings/nm-settings-connection.c | 2 +- src/supplicant/nm-supplicant-interface.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 683d6ed84f..be0c236201 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -339,7 +339,7 @@ connect_context_clear (NMModemBroadband *self) ConnectContext *ctx = self->_priv.ctx; g_clear_error (&ctx->first_error); - g_clear_pointer (&ctx->ip_types, (GDestroyNotify) g_array_unref); + g_clear_pointer (&ctx->ip_types, g_array_unref); nm_clear_g_cancellable (&ctx->cancellable); g_clear_object (&ctx->connection); g_clear_object (&ctx->connect_properties); diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 6878fb7fb9..713395420e 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -3021,7 +3021,7 @@ dispose (GObject *object) g_slist_free_full (priv->pending_auths, (GDestroyNotify) nm_auth_chain_unref); priv->pending_auths = NULL; - g_clear_pointer (&priv->seen_bssids, (GDestroyNotify) g_hash_table_destroy); + g_clear_pointer (&priv->seen_bssids, g_hash_table_destroy); set_visible (self, FALSE); diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 7f251bfff8..9fe1c90b1f 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -1985,7 +1985,7 @@ dispose (GObject *object) nm_clear_g_cancellable (&priv->other_cancellable); g_clear_object (&priv->wpas_proxy); - g_clear_pointer (&priv->bss_proxies, (GDestroyNotify) g_hash_table_destroy); + g_clear_pointer (&priv->bss_proxies, g_hash_table_destroy); g_clear_pointer (&priv->net_path, g_free); g_clear_pointer (&priv->dev, g_free);