diff options
Diffstat (limited to 'libc/stdlib/malloc-930716')
| -rw-r--r-- | libc/stdlib/malloc-930716/Makefile | 3 | ||||
| -rw-r--r-- | libc/stdlib/malloc-930716/calloc.c | 39 |
2 files changed, 2 insertions, 40 deletions
diff --git a/libc/stdlib/malloc-930716/Makefile b/libc/stdlib/malloc-930716/Makefile index 07dc94898..cc746707e 100644 --- a/libc/stdlib/malloc-930716/Makefile +++ b/libc/stdlib/malloc-930716/Makefile @@ -24,7 +24,8 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak -CSRC=calloc.c malloc.c +# calloc.c can be found at uClibc/libc/stdlib/calloc.c +CSRC=malloc.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) diff --git a/libc/stdlib/malloc-930716/calloc.c b/libc/stdlib/malloc-930716/calloc.c deleted file mode 100644 index e97db496d..000000000 --- a/libc/stdlib/malloc-930716/calloc.c +++ /dev/null @@ -1,39 +0,0 @@ -/* 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 */ - if (lsize != (size / nmemb)) { - __set_errno(ENOMEM); - return NULL; - } - if ((result=malloc(size))) { - memset(result, 0, size); - } - return result; -} |