commit 6cc5eba

Michael Forney  ·  2013-06-21 08:14:06 +0000 UTC
parent b8a7269 
Rename swc_unbind_resource to swc_remove_resource

Resources are now freed automatically by libwayland-server
6 files changed,  +6, -7
M keyboard.c
M output.c
M pointer.c
M seat.c
M util.c
M util.h
M keyboard.c
+1, -1 
1@@ -74,7 +74,7 @@ struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
2 
3     client_resource = wl_client_add_object(client, &wl_keyboard_interface,
4                                            NULL, id, NULL);
5-    wl_resource_set_destructor(client_resource, &swc_unbind_resource);
6+    wl_resource_set_destructor(client_resource, &swc_remove_resource);
7     wl_list_insert(&keyboard->resources, wl_resource_get_link(client_resource));
8 
9     printf("keyboard: adding client %p, resource: %p\n", client, client_resource);
M output.c
+1, -1 
1@@ -21,7 +21,7 @@ static void bind_output(struct wl_client * client, void * data,
2     resource = wl_client_add_object(client, &wl_output_interface, NULL, id,
3                                     output);
4     wl_list_insert(&output->resource_list, wl_resource_get_link(resource));
5-    wl_resource_set_destructor(resource, &swc_unbind_resource);
6+    wl_resource_set_destructor(resource, &swc_remove_resource);
7 
8     wl_output_send_geometry(resource, output->x, output->y,
9         output->physical_width, output->physical_height, 0, "unknown",
M pointer.c
+1, -1 
1@@ -107,7 +107,7 @@ struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
2 
3     client_resource = wl_client_add_object(client, &wl_pointer_interface,
4                                            &pointer_implementation, id, pointer);
5-    wl_resource_set_destructor(client_resource, &swc_unbind_resource);
6+    wl_resource_set_destructor(client_resource, &swc_remove_resource);
7     wl_list_insert(&pointer->resources,
8                    wl_resource_get_user_data(client_resource));
9
M seat.c
+1, -1 
1@@ -211,7 +211,7 @@ static void bind_seat(struct wl_client * client, void * data, uint32_t version,
2     resource = wl_client_add_object(client, &wl_seat_interface,
3                                     &seat_implementation, id, seat);
4     wl_list_insert(&seat->resources, wl_resource_get_link(resource));
5-    wl_resource_set_destructor(resource, &swc_unbind_resource);
6+    wl_resource_set_destructor(resource, &swc_remove_resource);
7 
8     wl_seat_send_capabilities(resource, seat->capabilities);
9 }
M util.c
+1, -2 
 1@@ -3,9 +3,8 @@
 2 #include <stdlib.h>
 3 #include <stdio.h>
 4 
 5-void swc_unbind_resource(struct wl_resource * resource)
 6+void swc_remove_resource(struct wl_resource * resource)
 7 {
 8     wl_list_remove(wl_resource_get_link(resource));
 9-    free(resource);
10 }
11
M util.h
+1, -1 
1@@ -3,7 +3,7 @@
2 
3 #include <wayland-server.h>
4 
5-void swc_unbind_resource(struct wl_resource * resource);
6+void swc_remove_resource(struct wl_resource * resource);
7 
8 #endif
9