From f912f24e28558a6cc078240d5b97e2cc76b67868 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 14 Nov 2015 23:10:00 +0100 Subject: add mallocz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- include/malloc.h | 21 +++++++++++++++++++++ include/slibc/portability.h | 6 ++++++ 2 files changed, 27 insertions(+) (limited to 'include') diff --git a/include/malloc.h b/include/malloc.h index 66adcbd..f4a910a 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -73,6 +73,27 @@ void* malloc(size_t) void* calloc(size_t, size_t) __GCC_ONLY(__attribute__((__malloc__, __warn_unused_result__))); +#if defined(__PLAN9_SOURCE) +/** + * Variant of `malloc` that conditionally clears the allocation with zeroes. + * + * This is a Plan 9 from Bell Labs extension. + * + * @param size The size of the allocation. + * @param clear Clear the allocation unless this value is zero. + * @return Pointer to the beginning of the new allocation. + * If `size` is zero, this function will either return + * `NULL` (that is what this implement does) or return + * a unique pointer that can later be freed with `free`. + * `NULL` is returned on error, and `errno` is set to + * indicate the error. + * + * @throws ENOMEM The process cannot allocate more memory. + */ +void* mallocz(size_t, int) + __GCC_ONLY(__attribute__((__malloc__, __warn_unused_result__))); +#endif + #if !defined(__PORTABLE) /** * Variant of `malloc` that clears the allocation with zeroes. diff --git a/include/slibc/portability.h b/include/slibc/portability.h index 5eae353..5ccb9fb 100644 --- a/include/slibc/portability.h +++ b/include/slibc/portability.h @@ -56,6 +56,9 @@ #ifdef __SUS_SOURCE # undef __SUS_SOURCE #endif +#ifdef __PLAN9_SOURCE +# undef __PLAN9_SOURCE +#endif #ifdef __GNU_SOURCE # undef __GNU_SOURCE #endif @@ -94,6 +97,9 @@ * is not defined. */ #if !defined(__PORTABLE) +# if defined(_PLAN9_SOURCE) +# define __PLAN9_SOURCE _PLAN9_SOURCE +# endif # if defined(_GNU_SOURCE) # define __GNU_SOURCE _GNU_SOURCE # endif -- cgit v1.2.3-70-g09d2