X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22b96fa759d3b97167b2eb450d35f45cb7827bd7..c60ecd167e796895eb98398295e320688ffe701b:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index fd1ecf0726..2a0c78bad5 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -17,7 +17,7 @@ #include "xbt/misc.h" #include "xbt/asserts.h" - + SG_BEGIN_DECL() /* They live in asserts.h, but need to be declared before this module. @@ -59,7 +59,9 @@ static XBT_INLINE char *xbt_strdup(const char *s) { /** @brief Like malloc, but xbt_die() on error @hideinitializer */ static XBT_INLINE void *xbt_malloc(unsigned int n){ - void *res=malloc(n); + void *res; +// if (n==0) xbt_die("malloc(0) is not portable"); + res=malloc(n); if (!res) xbt_die(bprintf("Memory allocation of %d bytes failed",n)); return res; @@ -68,7 +70,9 @@ static XBT_INLINE void *xbt_malloc(unsigned int n){ /** @brief like malloc, but xbt_die() on error and memset data to 0 @hideinitializer */ static XBT_INLINE void *xbt_malloc0(unsigned int n) { - void *res=calloc(n,1); + void *res; +// if (n==0) xbt_die("calloc(0) is not portable"); + res=calloc(n,1); if (!res) xbt_die(bprintf("Memory callocation of %d bytes failed",n)); return res; @@ -78,6 +82,7 @@ static XBT_INLINE void *xbt_malloc0(unsigned int n) { @hideinitializer */ static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){ void *res=res; +// if (s==0) xbt_die("realloc(0) is not portable"); if (s) { if (p) { res=realloc(p,s); @@ -105,9 +110,10 @@ static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){ #define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/ /*#define xbt_free_fct free * replacement with the guareenty of being a function FIXME:KILLME*/ -/** @brief like free - @hideinitializer */ +/** @brief like free, but you can be sure that it is a function */ XBT_PUBLIC(void) xbt_free_f(void* p); +/** @brief should be given a pointer to pointer, and frees the second one */ +XBT_PUBLIC(void) xbt_free_ref(void *d); /** @brief like calloc, but xbt_die() on error and don't memset to 0 @hideinitializer */