[PATCH weston 1/2] Add zalloc(size_t) allocator function

[Kristian Høgsberg]

On Thu, Aug 08, 2013 at 11:57:04AM +1000, Peter Hutterer wrote:
> Same as calloc(1, len).
> ---
> Feel free to squash this with the follow-up, I just kept it separately to
> make changes easier, the second one is just search/replace.
> 
>  shared/zalloc.h  | 40 ++++++++++++++++++++++++++++++++++++++++
>  src/Makefile.am  |  1 +
>  src/compositor.h |  1 +
>  3 files changed, 42 insertions(+)
>  create mode 100644 shared/zalloc.h
> 
> diff --git a/shared/zalloc.h b/shared/zalloc.h
> new file mode 100644
> index 0000000..84722dc
> --- /dev/null
> +++ b/shared/zalloc.h
> @@ -0,0 +1,40 @@
> +/*
> + * Copyright © 2013 Red Hat, Inc.
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and
> + * its documentation for any purpose is hereby granted without fee, provided
> + * that the above copyright notice appear in all copies and that both that
> + * copyright notice and this permission notice appear in supporting
> + * documentation, and that the name of the copyright holders not be used in
> + * advertising or publicity pertaining to distribution of the software
> + * without specific, written prior permission.  The copyright holders make
> + * no representations about the suitability of this software for any
> + * purpose.  It is provided "as is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
> + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
> + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
> + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
> + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#ifndef WESTON_ZALLOC_H
> +#define WESTON_ZALLOC_H
> +
> +#ifdef  __cplusplus
> +extern "C" {
> +#endif
> +
> +#include <stdlib.h>
> +
> +static inline void* zalloc(size_t size) {
> +	return calloc(1, size);
> +}

That looks good, applied with a tweak to match the wayland coding style:

static inline void *
zalloc(size_t size)
{
        return calloc(1, size);
}

thanks,
Kristian

> +#ifdef  __cplusplus
> +}
> +#endif
> +
> +#endif /* WESTON_ZALLOC_H */
> diff --git a/src/Makefile.am b/src/Makefile.am
> index d06e773..c7ce982 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -46,6 +46,7 @@ weston_SOURCES =				\
>  	pixman-renderer.h			\
>  	../shared/matrix.c			\
>  	../shared/matrix.h			\
> +	../shared/zalloc.h			\
>  	weston-launch.h				\
>  	weston-egl-ext.h
>  
> diff --git a/src/compositor.h b/src/compositor.h
> index 7fbc4b3..7600ce3 100644
> --- a/src/compositor.h
> +++ b/src/compositor.h
> @@ -37,6 +37,7 @@ extern "C" {
>  #include "version.h"
>  #include "matrix.h"
>  #include "config-parser.h"
> +#include "zalloc.h"
>  
>  #ifndef MIN
>  #define MIN(x,y) (((x) < (y)) ? (x) : (y))
> -- 
> 1.8.2.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel