From 61a6436ae0b13c1732d2198849f908ddce291172 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 22 Apr 2015 18:23:01 -0700 Subject: [PATCH] tests: Add an xmalloc helper function Signed-off-by: Bryce Harrington Reviewed-By: Derek Foreman --- tests/weston-test-client-helper.c | 11 +++++++++++ tests/weston-test-client-helper.h | 16 ++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c index 00fdf8f9..080bb629 100644 --- a/tests/weston-test-client-helper.c +++ b/tests/weston-test-client-helper.c @@ -32,6 +32,17 @@ #include "../shared/os-compatibility.h" #include "weston-test-client-helper.h" +void * +fail_on_null(void *p) +{ + if (p == NULL) { + fprintf(stderr, "out of memory\n"); + exit(EXIT_FAILURE); + } + return p; +} + + int surface_contains(struct surface *surface, int x, int y) { diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h index b46f158a..43a5aa70 100644 --- a/tests/weston-test-client-helper.h +++ b/tests/weston-test-client-helper.h @@ -132,15 +132,19 @@ struct surface { void *data; }; +void * +fail_on_null(void *p); + static inline void * -xzalloc(size_t size) +xzalloc(size_t s) { - void *p; + return fail_on_null(calloc(1, s)); +} - p = calloc(1, size); - assert(p); - - return p; +static inline void * +xmalloc(size_t s) +{ + return fail_on_null(malloc(s)); } struct client *