--- ray/src/common/ealloc.c	2003/02/22 02:07:22	2.2
+++ ray/src/common/ealloc.c	2022/01/19 00:59:33	2.11
@@ -1,115 +1,55 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ealloc.c,v 2.2 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: ealloc.c,v 2.11 2022/01/19 00:59:33 greg Exp $";
 #endif
 /*
  *  ealloc.c - memory routines which call quit on error.
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * 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. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 Lawrence Berkeley National Laboratory OR
- * ITS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 
 #include  <stdio.h>
 #include  <stdlib.h>
 
+#include "rterror.h"
+#include "rtmisc.h"
 
-char *
-emalloc(n)			/* return pointer to n uninitialized bytes */
-unsigned int  n;
+void *			/* return pointer to n uninitialized bytes */
+emalloc(size_t  n)
 {
-	register char  *cp;
+	void  *cp;
 	
 	if (n == 0)
 		return(NULL);
 
-	if ((cp = (char *)malloc(n)) != NULL)
+	if ((cp = malloc(n)) != NULL)
 		return(cp);
 
 	eputs("Out of memory in emalloc\n");
 	quit(1);
+	return NULL; /* pro forma return */
 }
 
 
-char *
-ecalloc(ne, es)			/* return pointer to initialized memory */
-register unsigned int  ne;
-unsigned int  es;
+void *			/* return pointer to initialized memory */
+ecalloc(size_t ne, size_t es)
 {
-	register char  *cp;
+	void  *cp;
 	
-	ne *= es;
-	if (ne == 0)
+	if (!ne | !es)
 		return(NULL);
 
-	if ((cp = (char *)malloc(ne)) == NULL) {
-		eputs("Out of memory in ecalloc\n");
-		quit(1);
-	}
-	cp += ne;
-	while (ne--)
-		*--cp = 0;
-	return(cp);
+	if ((cp = calloc(ne, es)) != NULL)
+		return(cp);
+
+	eputs("Out of memory in ecalloc\n");
+	quit(1);
+	return(NULL); /* pro forma return */
 }
 
 
-char *
-erealloc(cp, n)			/* reallocate cp to size n */
-register char  *cp;
-unsigned int  n;
+void *			/* reallocate cp to size n */
+erealloc(void  *cp, size_t  n)
 {
 	if (n == 0) {
 		if (cp != NULL)
@@ -118,21 +58,22 @@ unsigned int  n;
 	}
 
 	if (cp == NULL)
-		cp = (char *)malloc(n);
+		cp = malloc(n);
 	else 
-		cp = (char *)realloc((void *)cp, n);
+		cp = realloc(cp, n);
 
 	if (cp != NULL)
 		return(cp);
 
 	eputs("Out of memory in erealloc\n");
 	quit(1);
+	return NULL; /* pro forma return */
 }
 
 
-void
-efree(cp)			/* free memory allocated by above */
-char  *cp;
+void			/* free memory allocated by above */
+efree(void *cp)
 {
-	free((char *)cp);
+	if (cp)
+		free(cp);
 }