From a6a3db21846248979f7cd1062a2551aac6f9ad3c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 22 Jan 2020 18:19:46 +0100 Subject: base-modem: use g_steal_pointer() during dispose g_steal_pointer() sets the original location to NULL already, so it's very handy. --- src/mm-base-modem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index fb557020..d37d4d86 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -1663,19 +1663,16 @@ dispose (GObject *object) g_clear_object (&self->priv->primary); g_clear_object (&self->priv->secondary); - g_list_free_full (self->priv->data, g_object_unref); - self->priv->data = NULL; + g_list_free_full (g_steal_pointer (&self->priv->data), g_object_unref); g_clear_object (&self->priv->qcdm); g_clear_object (&self->priv->gps_control); g_clear_object (&self->priv->gps); g_clear_object (&self->priv->audio); #if defined WITH_QMI - g_list_free_full (self->priv->qmi, g_object_unref); - self->priv->qmi = NULL; + g_list_free_full (g_steal_pointer (&self->priv->qmi), g_object_unref); #endif #if defined WITH_MBIM - g_list_free_full (self->priv->mbim, g_object_unref); - self->priv->mbim = NULL; + g_list_free_full (g_steal_pointer (&self->priv->mbim), g_object_unref); #endif teardown_ports_table (self); -- cgit v1.2.3-70-g09d2