[retro-gtk/gtk-cleanup: 9/10] core-view-controller: Use autocleanups



commit 37c3d05ac04691e8a184fee642415f619369b52a
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Sun May 24 14:35:38 2020 +0200

    core-view-controller: Use autocleanups
    
    This makes the code safer and more concise.

 retro-gtk/retro-core-view-controller.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/retro-gtk/retro-core-view-controller.c b/retro-gtk/retro-core-view-controller.c
index 94f8d45..ac0294b 100644
--- a/retro-gtk/retro-core-view-controller.c
+++ b/retro-gtk/retro-core-view-controller.c
@@ -24,8 +24,7 @@ retro_core_view_controller_get_input_state (RetroController *base,
                                             RetroInput      *input)
 {
   RetroCoreViewController *self = RETRO_CORE_VIEW_CONTROLLER (base);
-  gpointer view;
-  gint16 result;
+  g_autoptr (RetroCoreView) view = NULL;
 
   if (retro_input_get_controller_type (input) != self->controller_type)
     return 0;
@@ -35,11 +34,7 @@ retro_core_view_controller_get_input_state (RetroController *base,
   if (view == NULL)
     return 0;
 
-  result = retro_core_view_get_input_state (RETRO_CORE_VIEW (view), input);
-
-  g_object_unref (G_OBJECT (view));
-
-  return result;
+  return retro_core_view_get_input_state (view, input);
 }
 
 static RetroControllerType
@@ -54,17 +49,13 @@ static guint64
 retro_core_view_controller_get_capabilities (RetroController *base)
 {
   RetroCoreViewController *self = RETRO_CORE_VIEW_CONTROLLER (base);
-  gpointer view;
+  g_autoptr (RetroCoreView) view = g_weak_ref_get (&self->view);
   guint64 capabilities;
 
-  view = g_weak_ref_get (&self->view);
-
   if (view == NULL)
     return 0;
 
-  capabilities = retro_core_view_get_controller_capabilities (RETRO_CORE_VIEW (view));
-
-  g_object_unref (G_OBJECT (view));
+  capabilities = retro_core_view_get_controller_capabilities (view);
 
   return capabilities & (1 << self->controller_type);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]