swc

commit 4a9aa152d370c91520174c4a8a97c3d9d0ba4800
parent 0979429e8ff983a46aa7b362b1c50907ac70981b
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 21 Jan 2014 18:02:49 -0800

buffer: Make buffer_initialize return void as it always succeeds

Diffstat:
M
libswc/buffer.c
 | 
4
+---
M
libswc/buffer.h
 | 
4
+---
M
libswc/compositor.c
 | 
11
++---------
M
libswc/wayland_buffer.c
 | 
16
++++------------

4 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/libswc/buffer.c b/libswc/buffer.c
@@ -25,12 +25,10 @@
 
 #include <wld/wld.h>
 
-bool swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld)
+void swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld)
 {
     buffer->wld = wld;
     wl_signal_init(&buffer->destroy_signal);
-
-    return true;
 }
 
 void swc_buffer_finalize(struct swc_buffer * buffer)
diff --git a/libswc/buffer.h b/libswc/buffer.h
@@ -33,9 +33,7 @@ struct swc_buffer
     struct wl_signal destroy_signal;
 };
 
-bool swc_buffer_initialize(struct swc_buffer * buffer,
-                           struct wld_buffer * wld);
-
+void swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld);
 void swc_buffer_finalize(struct swc_buffer * buffer);
 
 #endif
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -129,20 +129,13 @@ struct swc_buffer * buffer_get(struct wld_buffer * wld)
     struct swc_buffer * buffer;
 
     if (!(buffer = malloc(sizeof *buffer)))
-        goto error0;
-
-    if (!swc_buffer_initialize(buffer, wld))
-        goto error1;
+        return NULL;
 
+    swc_buffer_initialize(buffer, wld);
     wld->data = buffer;
     wld->destroy_data = &buffer_destroy;
 
     return buffer;
-
-error1:
-    free(buffer);
-error0:
-    return NULL;
 }
 
 static void handle_screen_event(struct wl_listener * listener, void * data)
diff --git a/libswc/wayland_buffer.c b/libswc/wayland_buffer.c
@@ -112,9 +112,7 @@ struct swc_buffer * swc_wayland_buffer_get(struct wl_resource * resource)
             if (!(buffer = malloc(sizeof *buffer)))
                 goto error0;
 
-            if (!swc_buffer_initialize(&buffer->base, wld))
-                goto error1;
-
+            swc_buffer_initialize(&buffer->base, wld);
             buffer->resource = resource;
             buffer->destroy_listener.notify = &handle_buffer_destroy;
             wl_resource_add_destroy_listener(resource,
@@ -124,8 +122,6 @@ struct swc_buffer * swc_wayland_buffer_get(struct wl_resource * resource)
 
     return &buffer->base;
 
-  error1:
-    free(buffer);
   error0:
     return NULL;
 }
@@ -147,25 +143,21 @@ struct swc_buffer * swc_wayland_buffer_new
     if (!buffer)
         goto error0;
 
-    if (!swc_buffer_initialize(&buffer->base, wld))
-        goto error1;
-
     buffer->resource = wl_resource_create(client, &wl_buffer_interface, 1, id);
 
     if (!buffer->resource)
-        goto error2;
+        goto error1;
 
     wl_resource_set_implementation(buffer->resource, &buffer_implementation,
                                    buffer, &destroy_buffer);
+    swc_buffer_initialize(&buffer->base, wld);
 
     return &buffer->base;
 
-  error2:
-    wl_client_post_no_memory(client);
-    swc_buffer_finalize(&buffer->base);
   error1:
     free(buffer);
   error0:
+    wl_client_post_no_memory(client);
     return NULL;
 }