commit 4a9aa15
Michael Forney
·
2014-01-22 02:02:49 +0000 UTC
parent 0979429
buffer: Make buffer_initialize return void as it always succeeds
4 files changed,
+8,
-27
+1,
-3
1@@ -25,12 +25,10 @@
2
3 #include <wld/wld.h>
4
5-bool swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld)
6+void swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld)
7 {
8 buffer->wld = wld;
9 wl_signal_init(&buffer->destroy_signal);
10-
11- return true;
12 }
13
14 void swc_buffer_finalize(struct swc_buffer * buffer)
+1,
-3
1@@ -33,9 +33,7 @@ struct swc_buffer
2 struct wl_signal destroy_signal;
3 };
4
5-bool swc_buffer_initialize(struct swc_buffer * buffer,
6- struct wld_buffer * wld);
7-
8+void swc_buffer_initialize(struct swc_buffer * buffer, struct wld_buffer * wld);
9 void swc_buffer_finalize(struct swc_buffer * buffer);
10
11 #endif
+2,
-9
1@@ -129,20 +129,13 @@ struct swc_buffer * buffer_get(struct wld_buffer * wld)
2 struct swc_buffer * buffer;
3
4 if (!(buffer = malloc(sizeof *buffer)))
5- goto error0;
6-
7- if (!swc_buffer_initialize(buffer, wld))
8- goto error1;
9+ return NULL;
10
11+ swc_buffer_initialize(buffer, wld);
12 wld->data = buffer;
13 wld->destroy_data = &buffer_destroy;
14
15 return buffer;
16-
17-error1:
18- free(buffer);
19-error0:
20- return NULL;
21 }
22
23 static void handle_screen_event(struct wl_listener * listener, void * data)
+4,
-12
1@@ -112,9 +112,7 @@ struct swc_buffer * swc_wayland_buffer_get(struct wl_resource * resource)
2 if (!(buffer = malloc(sizeof *buffer)))
3 goto error0;
4
5- if (!swc_buffer_initialize(&buffer->base, wld))
6- goto error1;
7-
8+ swc_buffer_initialize(&buffer->base, wld);
9 buffer->resource = resource;
10 buffer->destroy_listener.notify = &handle_buffer_destroy;
11 wl_resource_add_destroy_listener(resource,
12@@ -124,8 +122,6 @@ struct swc_buffer * swc_wayland_buffer_get(struct wl_resource * resource)
13
14 return &buffer->base;
15
16- error1:
17- free(buffer);
18 error0:
19 return NULL;
20 }
21@@ -147,25 +143,21 @@ struct swc_buffer * swc_wayland_buffer_new
22 if (!buffer)
23 goto error0;
24
25- if (!swc_buffer_initialize(&buffer->base, wld))
26- goto error1;
27-
28 buffer->resource = wl_resource_create(client, &wl_buffer_interface, 1, id);
29
30 if (!buffer->resource)
31- goto error2;
32+ goto error1;
33
34 wl_resource_set_implementation(buffer->resource, &buffer_implementation,
35 buffer, &destroy_buffer);
36+ swc_buffer_initialize(&buffer->base, wld);
37
38 return &buffer->base;
39
40- error2:
41- wl_client_post_no_memory(client);
42- swc_buffer_finalize(&buffer->base);
43 error1:
44 free(buffer);
45 error0:
46+ wl_client_post_no_memory(client);
47 return NULL;
48 }
49