[libmanette] Use g_clear_(pointer|object) where possible

[Adrien Plazas <aplazas src gnome org>]

commit e8796f8066940ee6857494c784b4dec953b5faea
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Sun Nov 22 13:02:24 2020 +0100

    Use g_clear_(pointer|object) where possible

 src/manette-device.c          | 11 +++++------
 src/manette-event.c           |  3 +--
 src/manette-mapping-manager.c |  8 ++++----
 src/manette-mapping.c         | 17 +++++++----------
 src/manette-monitor.c         |  9 ++++-----
 5 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/src/manette-device.c b/src/manette-device.c
index 672b162..e7be34c 100644
--- a/src/manette-device.c
+++ b/src/manette-device.c
@@ -113,9 +113,9 @@ manette_device_event_signal_data_new (ManetteDevice *self,
 static void
 manette_device_event_signal_data_free (ManetteDeviceEventSignalData *signal_data)
 {
-  g_object_unref (signal_data->self);
-  manette_event_free (signal_data->event);
-  g_free (signal_data);
+  g_clear_object (&signal_data->self);
+  g_clear_pointer (&signal_data->event, manette_event_free);
+  g_clear_pointer (&signal_data, g_free);
 }
 
 static gboolean
@@ -220,9 +220,8 @@ manette_device_finalize (GObject *object)
 
   close (self->fd);
   remove_event_source (self);
-  if (self->evdev_device != NULL)
-    libevdev_free (self->evdev_device);
-  g_free (self->guid);
+  g_clear_pointer (&self->evdev_device, libevdev_free);
+  g_clear_pointer (&self->guid, g_free);
   g_clear_object (&self->mapping);
 
   G_OBJECT_CLASS (manette_device_parent_class)->finalize (object);
diff --git a/src/manette-event.c b/src/manette-event.c
index 3afb021..c665aea 100644
--- a/src/manette-event.c
+++ b/src/manette-event.c
@@ -80,8 +80,7 @@ manette_event_free (ManetteEvent *self)
 {
   g_return_if_fail (self);
 
-  if (self->any.device != NULL)
-    g_object_unref (self->any.device);
+  g_clear_object (&self->any.device);
 
   g_slice_free (ManetteEvent, self);
 }
diff --git a/src/manette-mapping-manager.c b/src/manette-mapping-manager.c
index deb8c00..616be3d 100644
--- a/src/manette-mapping-manager.c
+++ b/src/manette-mapping-manager.c
@@ -387,10 +387,10 @@ manette_mapping_manager_finalize (GObject *object)
 {
   ManetteMappingManager *self = MANETTE_MAPPING_MANAGER (object);
 
-  g_hash_table_unref (self->names);
-  g_hash_table_unref (self->default_mappings);
-  g_hash_table_unref (self->user_mappings);
-  g_free (self->user_mappings_uri);
+  g_clear_pointer (&self->names, g_hash_table_unref);
+  g_clear_pointer (&self->default_mappings, g_hash_table_unref);
+  g_clear_pointer (&self->user_mappings, g_hash_table_unref);
+  g_clear_pointer (&self->user_mappings_uri, g_free);
   g_clear_object (&self->user_mappings_monitor);
 
   G_OBJECT_CLASS (manette_mapping_manager_parent_class)->finalize (object);
diff --git a/src/manette-mapping.c b/src/manette-mapping.c
index 55eaf18..5a3f109 100644
--- a/src/manette-mapping.c
+++ b/src/manette-mapping.c
@@ -42,12 +42,9 @@ manette_mapping_finalize (GObject *object)
 {
   ManetteMapping *self = (ManetteMapping *)object;
 
-  if (self->axis_bindings != NULL)
-    g_array_free (self->axis_bindings, TRUE);
-  if (self->button_bindings != NULL)
-    g_array_free (self->button_bindings, TRUE);
-  if (self->hat_bindings != NULL)
-    g_array_free (self->hat_bindings, TRUE);
+  g_clear_pointer (&self->axis_bindings, g_array_unref);
+  g_clear_pointer (&self->button_bindings, g_array_unref);
+  g_clear_pointer (&self->hat_bindings, g_array_unref);
 
   G_OBJECT_CLASS (manette_mapping_parent_class)->finalize (object);
 }
@@ -297,8 +294,8 @@ parse_destination_input (gchar    *start,
 static void
 manette_mapping_binding_try_free (ManetteMappingBinding **binding)
 {
-  if (G_LIKELY (binding && *binding))
-    manette_mapping_binding_free (*binding);
+  if (G_LIKELY (binding))
+    g_clear_pointer (binding, manette_mapping_binding_free);
 }
 
 static void
@@ -498,8 +495,8 @@ set_from_mapping_string (ManetteMapping *self,
 static void
 g_array_try_free (GArray **array)
 {
-  if (G_LIKELY (array && *array))
-    g_array_free (*array, TRUE);
+  if (G_LIKELY (array))
+    g_clear_pointer (array, g_array_unref);
 }
 
 ManetteMapping *
diff --git a/src/manette-monitor.c b/src/manette-monitor.c
index 1ce8c76..bd6a7cd 100644
--- a/src/manette-monitor.c
+++ b/src/manette-monitor.c
@@ -426,15 +426,14 @@ manette_monitor_finalize (GObject *object)
   ManetteMonitor *self = MANETTE_MONITOR (object);
 
 #ifdef GUDEV_ENABLED
-  if (self->client != NULL)
-    g_object_unref (self->client);
+  g_clear_object (&self->client);
 #else
   g_clear_object (&self->monitor);
-  g_hash_table_unref (self->potential_devices);
+  g_clear_pointer (&self->potential_devices, g_hash_table_unref);
 #endif
 
-  g_object_unref (self->mapping_manager);
-  g_hash_table_unref (self->devices);
+  g_clear_object (&self->mapping_manager);
+  g_clear_pointer (&self->devices, g_hash_table_unref);
 
   G_OBJECT_CLASS (manette_monitor_parent_class)->finalize (object);
 }