swc

commit e1f849858b43c2092fec476a74dd4a6b19435dec
parent 22bd1d3e96a7e7f49de9ce8137aab0834b66acc5
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 16 Aug 2014 12:49:57 -0700

Style

Diffstat:
M
libswc/compositor.c
 | 
6
++----
M
libswc/view.c
 | 
18
+++++++++---------

2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -174,9 +174,9 @@ static struct target * target_new(struct screen * screen)
 
     return target;
 
-error1:
+  error1:
     free(target);
-error0:
+  error0:
     return NULL;
 }
 
@@ -216,8 +216,6 @@ static void repaint_view(struct target * target, struct compositor_view * view,
     /* Draw border */
     if (pixman_region32_not_empty(&border_damage))
     {
-        DEBUG("\t\tRedrawing border\n");
-
         pixman_region32_translate(&border_damage,
                                   -target->view->geometry.x,
                                   -target->view->geometry.y);
diff --git a/libswc/view.c b/libswc/view.c
@@ -61,18 +61,18 @@ int view_attach(struct view * view, struct wld_buffer * buffer)
 {
     int ret;
 
-    if ((ret = view->impl->attach(view, buffer)) == 0)
-    {
-        if (view->buffer)
-            wld_buffer_unreference(view->buffer);
+    if ((ret = view->impl->attach(view, buffer)) < 0)
+        return ret;
 
-        if (buffer)
-            wld_buffer_reference(buffer);
+    if (view->buffer)
+        wld_buffer_unreference(view->buffer);
 
-        view->buffer = buffer;
-    }
+    if (buffer)
+        wld_buffer_reference(buffer);
+
+    view->buffer = buffer;
 
-    return ret;
+    return 0;
 }
 
 bool view_update(struct view * view)