From 97d0d1b9cdde83cad131a8958b37c806ca2ae6c8 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Wed, 10 Nov 1999 20:12:31 +0000
Subject: calloc() needs to be separate from malloc in case a user wants to
 have their own malloc() implementation.

---
 src/lib/libc/stdlib/malloc.c | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/lib/libc/stdlib/malloc.c')

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 3582d7980c..88e25995f3 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.37 1999/11/09 19:25:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.38 1999/11/10 20:12:31 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -1278,27 +1278,3 @@ realloc(void *ptr, size_t size)
 	wrterror("out of memory.\n");
     return (r);
 }
-
-void *
-calloc(size_t num, size_t size)
-{
-    register void *r;
-
-    malloc_func = " in calloc():";
-    THREAD_LOCK();
-    if (malloc_active++) {
-	wrtwarning("recursive call.\n");
-        malloc_active--;
-	return (0);
-    }
-    size *= num;
-    r = imalloc(size);
-    if (r && !malloc_zero)
-	memset(r, 0, size)
-    UTRACE(0, size, r);
-    malloc_active--;
-    THREAD_UNLOCK();
-    if (malloc_xmalloc && !r)
-	wrterror("out of memory.\n");
-    return (r);
-}
-- 
cgit v1.2.3-55-g6feb