--- ray/src/common/ealloc.c 2003/02/22 02:07:22 2.2
+++ ray/src/common/ealloc.c 2003/11/14 17:22:06 2.8
@@ -1,75 +1,20 @@
#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.8 2003/11/14 17:22:06 schorsch 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 "copyright.h"
#include
#include
+#include "rterror.h"
-char *
-emalloc(n) /* return pointer to n uninitialized bytes */
-unsigned int n;
+extern char * /* return pointer to n uninitialized bytes */
+emalloc(unsigned int n)
{
register char *cp;
@@ -81,13 +26,12 @@ unsigned int n;
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;
+extern char * /* return pointer to initialized memory */
+ecalloc(register unsigned int ne, unsigned int es)
{
register char *cp;
@@ -106,14 +50,12 @@ unsigned int es;
}
-char *
-erealloc(cp, n) /* reallocate cp to size n */
-register char *cp;
-unsigned int n;
+extern char * /* reallocate cp to size n */
+erealloc(register char *cp, unsigned int n)
{
if (n == 0) {
if (cp != NULL)
- free(cp);
+ free((void *)cp);
return(NULL);
}
@@ -127,12 +69,12 @@ unsigned int n;
eputs("Out of memory in erealloc\n");
quit(1);
+ return NULL; /* pro forma return */
}
-void
-efree(cp) /* free memory allocated by above */
-char *cp;
+extern void /* free memory allocated by above */
+efree(char *cp)
{
- free((char *)cp);
+ free((void *)cp);
}