--- ray/src/common/ealloc.c 1991/11/12 16:54:23 2.1
+++ ray/src/common/ealloc.c 2003/02/22 02:07:22 2.2
@@ -1,30 +1,82 @@
-/* Copyright 1988 Regents of the University of California */
-
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: ealloc.c,v 2.2 2003/02/22 02:07:22 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
+ * .
+ */
+
#include
+#include
-char *malloc(), *realloc(), *emalloc(), *ecalloc(), *erealloc();
-
-
char *
emalloc(n) /* return pointer to n uninitialized bytes */
-unsigned n;
+unsigned int n;
{
register char *cp;
if (n == 0)
return(NULL);
- if ((cp = malloc(n)) != NULL)
+ if ((cp = (char *)malloc(n)) != NULL)
return(cp);
eputs("Out of memory in emalloc\n");
@@ -34,8 +86,8 @@ unsigned n;
char *
ecalloc(ne, es) /* return pointer to initialized memory */
-register unsigned ne;
-unsigned es;
+register unsigned int ne;
+unsigned int es;
{
register char *cp;
@@ -43,7 +95,7 @@ unsigned es;
if (ne == 0)
return(NULL);
- if ((cp = malloc(ne)) == NULL) {
+ if ((cp = (char *)malloc(ne)) == NULL) {
eputs("Out of memory in ecalloc\n");
quit(1);
}
@@ -57,7 +109,7 @@ unsigned es;
char *
erealloc(cp, n) /* reallocate cp to size n */
register char *cp;
-unsigned n;
+unsigned int n;
{
if (n == 0) {
if (cp != NULL)
@@ -66,9 +118,9 @@ unsigned n;
}
if (cp == NULL)
- cp = malloc(n);
+ cp = (char *)malloc(n);
else
- cp = realloc(cp, n);
+ cp = (char *)realloc((void *)cp, n);
if (cp != NULL)
return(cp);
@@ -78,8 +130,9 @@ unsigned n;
}
+void
efree(cp) /* free memory allocated by above */
char *cp;
{
- free(cp);
+ free((char *)cp);
}