BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / stdlib / calloc.c

diff --git a/usr/src/lib/libc/stdlib/calloc.c b/usr/src/lib/libc/stdlib/calloc.c
index 7222329..d1056d1 100644 (file)
--- a/usr/src/lib/libc/stdlib/calloc.c
+++ b/usr/src/lib/libc/stdlib/calloc.c
@@ -1,27 +1,45 @@
-#ifndef lint
-static char sccsid[] = "@(#)calloc.c   5.1 (Berkeley) %G%";
-#endif not lint
-
-/*
- * Calloc - allocate and clear memory block
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
  */

-char *
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)calloc.c   5.5 (Berkeley) 5/17/90";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+void *

 calloc(num, size)
 calloc(num, size)

-       register unsigned num, size;
+       size_t num;
+       register size_t size;

 {
 {

-       extern char *malloc();
-       register char *p;
+       register void *p;

 
        size *= num;
        if (p = malloc(size))
                bzero(p, size);
 
        size *= num;
        if (p = malloc(size))
                bzero(p, size);

-       return (p);
+       return(p);

 }
 
 }
 

+void

 cfree(p, num, size)
 cfree(p, num, size)

-       char *p;
-       unsigned num;
-       unsigned size;
+       void *p;
+       size_t num, size;

 {
 {

-       free(p);
+       (void)free(p);

 }
 }