From 1f0961368f58a9fec319d86c79a86a9f0d008cf5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Jan 2006 01:17:39 +0000 Subject: * remove a lot of compiler warnings introduced by using some new GCC flags * add typedefs for public structs and enums and drop the struct/enum prefixs from all uses where it makes sense git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@447 fefdeb5f-60dc-0310-8127-8f9354f1896f --- polyp/xmalloc.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'polyp/xmalloc.h') diff --git a/polyp/xmalloc.h b/polyp/xmalloc.h index b37ece90..2946011a 100644 --- a/polyp/xmalloc.h +++ b/polyp/xmalloc.h @@ -24,6 +24,8 @@ #include #include +#include +#include void* pa_xmalloc(size_t l); void *pa_xmalloc0(size_t l); @@ -35,4 +37,22 @@ char *pa_xstrndup(const char *s, size_t l); void* pa_xmemdup(const void *p, size_t l); +/** Internal helper for pa_xnew() */ +static inline void* pa_xnew_internal(unsigned n, size_t k) { + assert(n < INT_MAX/k); + return pa_xmalloc(n*k); +} + +/** Allocate n new structures of the specified type. */ +#define pa_xnew(type, n) ((type*) pa_xnew_internal((n), sizeof(type))) + +/** Internal helper for pa_xnew0() */ +static inline void* pa_xnew0_internal(unsigned n, size_t k) { + assert(n < INT_MAX/k); + return pa_xmalloc0(n*k); +} + +/** Same as pa_xnew() but set the memory to zero */ +#define pa_xnew0(type, n) ((type*) pa_xnew0_internal((n), sizeof(type))) + #endif -- cgit