X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/share/zoneinfo/ialloc.c

diff --git a/usr/src/share/zoneinfo/ialloc.c b/usr/src/share/zoneinfo/ialloc.c
index 25cc20caeb..118a97b168 100644
--- a/usr/src/share/zoneinfo/ialloc.c
+++ b/usr/src/share/zoneinfo/ialloc.c
@@ -1,14 +1,51 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Arthur David Olson of the National Cancer Institute.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 #ifndef lint
-#ifndef NOID
+static char sccsid[] = "@(#)ialloc.c	8.1 (Berkeley) 6/8/93";
+#endif /* not lint */
+
+#ifdef notdef
 static char	elsieid[] = "@(#)ialloc.c	8.18";
-#endif /* !defined NOID */
-#endif /* !defined lint */
+#endif
 
 /*LINTLIBRARY*/
 
-#include "string.h"
-#include "stdlib.h"
-#include "nonstd.h"
+#include <string.h>
+#include <stdlib.h>
 
 #ifdef MAL
 #define NULLMAL(x)	((x) == NULL || (x) == MAL)
@@ -18,12 +55,12 @@ static char	elsieid[] = "@(#)ialloc.c	8.18";
 
 #define nonzero(n)	(((n) == 0) ? 1 : (n))
 
-char *	icalloc P((int nelem, int elsize));
-char *	icatalloc P((char * old, const char * new));
-char *	icpyalloc P((const char * string));
-char *	imalloc P((int n));
-char *	irealloc P((char * pointer, int size));
-void	ifree P((char * pointer));
+char *	icalloc __P((int nelem, int elsize));
+char *	icatalloc __P((char * old, const char * new));
+char *	icpyalloc __P((const char * string));
+char *	imalloc __P((int n));
+char *	irealloc __P((char * pointer, int size));
+void	ifree __P((char * pointer));
 
 char *
 imalloc(n)
@@ -32,10 +69,10 @@ const int	n;
 #ifdef MAL
 	register char *	result;
 
-	result = malloc((alloc_size_t) nonzero(n));
+	result = malloc((size_t) nonzero(n));
 	return NULLMAL(result) ? NULL : result;
 #else /* !defined MAL */
-	return malloc((alloc_size_t) nonzero(n));
+	return malloc((size_t) nonzero(n));
 #endif /* !defined MAL */
 }
 
@@ -46,7 +83,7 @@ int	elsize;
 {
 	if (nelem == 0 || elsize == 0)
 		nelem = elsize = 1;
-	return calloc((alloc_size_t) nelem, (alloc_size_t) elsize);
+	return calloc((size_t) nelem, (size_t) elsize);
 }
 
 char *
@@ -56,7 +93,7 @@ const int	size;
 {
 	if (NULLMAL(pointer))
 		return imalloc(size);
-	return realloc((genericptr_t) pointer, (alloc_size_t) nonzero(size));
+	return realloc((void *) pointer, (size_t) nonzero(size));
 }
 
 char *