diff options
| author | Bastien Nocera <hadess@hadess.net> | 2017-10-31 11:22:45 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2017-10-31 17:42:55 +0100 |
| commit | 296f5855d0c328d86893075b05acaa546ce52355 (patch) | |
| tree | 1fb258684d5303fa5cddc3dbe55c2b0dd089a6b2 | |
| parent | b3f39a5ca3bce97c6c40b8220ba20c60e2560bcf (diff) | |
| download | upower-296f5855d0c328d86893075b05acaa546ce52355.tar.gz | |
main: Use g_clear_object() when possible
Rather than using != NULL, followed by unref().
https://bugs.freedesktop.org/show_bug.cgi?id=103380
| -rw-r--r-- | src/up-device.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/up-device.c b/src/up-device.c index f8befe8..336bd0e 100644 --- a/src/up-device.c +++ b/src/up-device.c @@ -464,10 +464,7 @@ void up_device_unplug (UpDevice *device) { /* break circular dependency */ - if (device->priv->daemon != NULL) { - g_object_unref (device->priv->daemon); - device->priv->daemon = NULL; - } + g_clear_object (&device->priv->daemon); } /** @@ -717,10 +714,8 @@ up_device_finalize (GObject *object) device = UP_DEVICE (object); g_return_if_fail (device->priv != NULL); - if (device->priv->native != NULL) - g_object_unref (device->priv->native); - if (device->priv->daemon != NULL) - g_object_unref (device->priv->daemon); + g_clear_object (&device->priv->native); + g_clear_object (&device->priv->daemon); g_object_unref (device->priv->history); G_OBJECT_CLASS (up_device_parent_class)->finalize (object); |