clients & tests: Unify multiple definitions of x*alloc and related functions
Direct fail_on_null calls now produce output like:
[weston-info] clients/weston-info.c:714: out of memory
xmalloc, et al produce output on failure like:
[weston-info] out of memory (-1)
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index 86f7c50..0b932d6 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -61,6 +61,7 @@
#include "ivi-layout-export.h"
#include "ivi-hmi-controller-server-protocol.h"
#include "shared/helpers.h"
+#include "shared/xalloc.h"
/*****************************************************************************
* structure, globals
@@ -151,17 +152,6 @@
* local functions
****************************************************************************/
static void *
-fail_on_null(void *p, size_t size, char *file, int32_t line)
-{
- if (size && !p) {
- weston_log("%s(%d) %zd: out of memory\n", file, line, size);
- exit(EXIT_FAILURE);
- }
-
- return p;
-}
-
-static void *
mem_alloc(size_t size, char *file, int32_t line)
{
return fail_on_null(calloc(1, size), size, file, line);