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 15b302b..d1056d1 100644 (file)
--- a/usr/src/lib/libc/stdlib/calloc.c
+++ b/usr/src/lib/libc/stdlib/calloc.c
@@ -1,42 +1,45 @@
-/*
- * Copyright (c) 1988 The Regents of the University of California.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
+ * 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
  * 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)calloc.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)calloc.c   5.5 (Berkeley) 5/17/90";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-#include <sys/types.h>
+#include <stdlib.h>

 
 

-char *
-calloc(nelem, elsize)
-       u_int nelem, elsize;
+void *
+calloc(num, size)
+       size_t num;
+       register size_t size;

 {
 {

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

 
 

-       elsize *= nelem;
-       if (p = malloc(elsize))
-               bzero(p, elsize);
+       size *= num;
+       if (p = malloc(size))
+               bzero(p, size);

        return(p);
 }
 
        return(p);
 }
 

-/* ARGSUSED */
-cfree(p, nelem, elsize)
-       char *p;
-       u_int nelem, elsize;
+void
+cfree(p, num, size)
+       void *p;
+       size_t num, size;

 {
 {

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

 }
 }