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>
This commit is contained in:
committed by
Pekka Paalanen
parent
4e221f0327
commit
e99e4bf2b9
@@ -29,6 +29,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "shared/helpers.h"
|
||||
#include "shared/xalloc.h"
|
||||
#include "weston-test-client-helper.h"
|
||||
#include "ivi-application-client-protocol.h"
|
||||
#include "ivi-test.h"
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "shared/helpers.h"
|
||||
#include "shared/xalloc.h"
|
||||
#include "weston-test-client-helper.h"
|
||||
#include "presentation-time-client-protocol.h"
|
||||
|
||||
|
||||
@@ -33,25 +33,15 @@
|
||||
#include <sys/mman.h>
|
||||
#include <cairo.h>
|
||||
|
||||
#include "zalloc.h"
|
||||
#include "shared/os-compatibility.h"
|
||||
#include "shared/xalloc.h"
|
||||
#include "shared/zalloc.h"
|
||||
#include "weston-test-client-helper.h"
|
||||
|
||||
#define max(a, b) (((a) > (b)) ? (a) : (b))
|
||||
#define min(a, b) (((a) > (b)) ? (b) : (a))
|
||||
#define clip(x, a, b) min(max(x, a), b)
|
||||
|
||||
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)
|
||||
{
|
||||
|
||||
@@ -145,21 +145,6 @@ struct rectangle {
|
||||
int height;
|
||||
};
|
||||
|
||||
void *
|
||||
fail_on_null(void *p);
|
||||
|
||||
static inline void *
|
||||
xzalloc(size_t s)
|
||||
{
|
||||
return fail_on_null(calloc(1, s));
|
||||
}
|
||||
|
||||
static inline void *
|
||||
xmalloc(size_t s)
|
||||
{
|
||||
return fail_on_null(malloc(s));
|
||||
}
|
||||
|
||||
struct client *
|
||||
create_client(void);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user