mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-test-client-helper.c: Assert on failed allocations

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-10-09 14:01:23 -07:00
parent a2e20c369b
commit c1b244f61d
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/weston-test-client-helper.c
+19 -10
View File
@@ -31,6 +31,17 @@
#include "../shared/os-compatibility.h" #include "../shared/os-compatibility.h"
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
static inline void *
xzalloc(size_t size)
{
void *p;
p = calloc(1, size);
assert(p);
return p;
}
int int
surface_contains(struct surface *surface, int x, int y) surface_contains(struct surface *surface, int x, int y)
{ {
@@ -341,7 +352,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
struct keyboard *keyboard; struct keyboard *keyboard;
if ((caps & WL_SEAT_CAPABILITY_POINTER) && !input->pointer) { if ((caps & WL_SEAT_CAPABILITY_POINTER) && !input->pointer) {
pointer = calloc(1, sizeof *pointer); pointer = xzalloc(sizeof *pointer);
pointer->wl_pointer = wl_seat_get_pointer(seat); pointer->wl_pointer = wl_seat_get_pointer(seat);
wl_pointer_set_user_data(pointer->wl_pointer, pointer); wl_pointer_set_user_data(pointer->wl_pointer, pointer);
wl_pointer_add_listener(pointer->wl_pointer, &pointer_listener, wl_pointer_add_listener(pointer->wl_pointer, &pointer_listener,
@@ -354,7 +365,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
} }
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->keyboard) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->keyboard) {
keyboard = calloc(1, sizeof *keyboard); keyboard = xzalloc(sizeof *keyboard);
keyboard->wl_keyboard = wl_seat_get_keyboard(seat); keyboard->wl_keyboard = wl_seat_get_keyboard(seat);
wl_keyboard_set_user_data(keyboard->wl_keyboard, keyboard); wl_keyboard_set_user_data(keyboard->wl_keyboard, keyboard);
wl_keyboard_add_listener(keyboard->wl_keyboard, &keyboard_listener, wl_keyboard_add_listener(keyboard->wl_keyboard, &keyboard_listener,
@@ -419,8 +430,7 @@ handle_global(void *data, struct wl_registry *registry,
struct test *test; struct test *test;
struct global *global; struct global *global;
global = malloc(sizeof *global); global = xzalloc(sizeof *global);
assert(global);
global->name = id; global->name = id;
global->interface = strdup(interface); global->interface = strdup(interface);
assert(interface); assert(interface);
@@ -432,7 +442,7 @@ handle_global(void *data, struct wl_registry *registry,
wl_registry_bind(registry, id, wl_registry_bind(registry, id,
&wl_compositor_interface, 1); &wl_compositor_interface, 1);
} else if (strcmp(interface, "wl_seat") == 0) { } else if (strcmp(interface, "wl_seat") == 0) {
input = calloc(1, sizeof *input); input = xzalloc(sizeof *input);
input->wl_seat = input->wl_seat =
wl_registry_bind(registry, id, wl_registry_bind(registry, id,
&wl_seat_interface, 1); &wl_seat_interface, 1);
@@ -444,7 +454,7 @@ handle_global(void *data, struct wl_registry *registry,
&wl_shm_interface, 1); &wl_shm_interface, 1);
wl_shm_add_listener(client->wl_shm, &shm_listener, client); wl_shm_add_listener(client->wl_shm, &shm_listener, client);
} else if (strcmp(interface, "wl_output") == 0) { } else if (strcmp(interface, "wl_output") == 0) {
output = malloc(sizeof *output); output = xzalloc(sizeof *output);
output->wl_output = output->wl_output =
wl_registry_bind(registry, id, wl_registry_bind(registry, id,
&wl_output_interface, 1); &wl_output_interface, 1);
@@ -452,7 +462,7 @@ handle_global(void *data, struct wl_registry *registry,
&output_listener, output); &output_listener, output);
client->output = output; client->output = output;
} else if (strcmp(interface, "wl_test") == 0) { } else if (strcmp(interface, "wl_test") == 0) {
test = calloc(1, sizeof *test); test = xzalloc(sizeof *test);
test->wl_test = test->wl_test =
wl_registry_bind(registry, id, wl_registry_bind(registry, id,
&wl_test_interface, 1); &wl_test_interface, 1);
@@ -481,7 +491,7 @@ client_create(int x, int y, int width, int height)
wl_log_set_handler_client(log_handler); wl_log_set_handler_client(log_handler);
/* connect to display */ /* connect to display */
client = calloc(1, sizeof *client); client = xzalloc(sizeof *client);
client->wl_display = wl_display_connect(NULL); client->wl_display = wl_display_connect(NULL);
assert(client->wl_display); assert(client->wl_display);
wl_list_init(&client->global_list); wl_list_init(&client->global_list);
@@ -504,8 +514,7 @@ client_create(int x, int y, int width, int height)
assert(client->output); assert(client->output);
/* initialize the client surface */ /* initialize the client surface */
surface = calloc(1, sizeof *surface); surface = xzalloc(sizeof *surface);
surface->wl_surface = surface->wl_surface =
wl_compositor_create_surface(client->wl_compositor); wl_compositor_create_surface(client->wl_compositor);
assert(surface->wl_surface); assert(surface->wl_surface);