[mutter/gbsneto/layer-node-cleanups: 2/6] clutter/layer-node: Simplify some code with g_clear_pointer



commit d67cf999aff08ab8819192535833c8dbcdfd0e01
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon Mar 30 21:43:07 2020 -0300

    clutter/layer-node: Simplify some code with g_clear_pointer
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1167

 clutter/clutter/clutter-paint-nodes.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index ab3c4b186..50dbd4666 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -1374,11 +1374,8 @@ clutter_layer_node_finalize (ClutterPaintNode *node)
 {
   ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node);
 
-  if (lnode->pipeline != NULL)
-    cogl_object_unref (lnode->pipeline);
-
-  if (lnode->offscreen != NULL)
-    cogl_object_unref (lnode->offscreen);
+  g_clear_pointer (&lnode->pipeline, cogl_object_unref);
+  g_clear_pointer (&lnode->offscreen, cogl_object_unref);
 
   CLUTTER_PAINT_NODE_CLASS (clutter_layer_node_parent_class)->finalize (node);
 }
@@ -1447,10 +1444,7 @@ clutter_layer_node_new (const CoglMatrix        *projection,
   if (res->offscreen == NULL)
     {
       g_critical ("%s: Unable to create an offscreen buffer", G_STRLOC);
-
-      cogl_object_unref (res->texture);
-      res->texture = NULL;
-
+      g_clear_pointer (&res->texture, cogl_object_unref);
       goto out;
     }
 


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