diff options
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/Makefile | 3 | ||||
| -rw-r--r-- | libc/stdlib/malloc/calloc.c | 41 |
2 files changed, 42 insertions, 2 deletions
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile index 7172198f2..ce789f8e8 100644 --- a/libc/stdlib/malloc/Makefile +++ b/libc/stdlib/malloc/Makefile @@ -24,8 +24,7 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak -# calloc.c can be found at uClibc/libc/stdlib/calloc.c -CSRC = malloc.c free.c realloc.c memalign.c \ +CSRC = malloc.c calloc.c free.c realloc.c memalign.c \ heap_alloc.c heap_alloc_at.c heap_free.c # Turn on malloc debugging if requested diff --git a/libc/stdlib/malloc/calloc.c b/libc/stdlib/malloc/calloc.c new file mode 100644 index 000000000..15281a97f --- /dev/null +++ b/libc/stdlib/malloc/calloc.c @@ -0,0 +1,41 @@ +/* vi: set sw=4 ts=4: */ +/* calloc for uClibc + * + * Copyright (C) 2002 by Erik Andersen <andersen@uclibc.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License + * for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +void * calloc(size_t nmemb, size_t lsize) +{ + void *result; + size_t size=lsize * nmemb; + + /* guard vs integer overflow, but allow nmemb + * to fall through and call malloc(0) */ + if (nmemb && lsize != (size / nmemb)) { + __set_errno(ENOMEM); + return NULL; + } + if ((result=malloc(size)) != NULL) { + memset(result, 0, size); + } + return result; +} + |