--- ray/src/common/lookup.c 1998/09/03 14:22:23 2.5
+++ ray/src/common/lookup.c 2003/02/22 02:07:22 2.6
@@ -1,14 +1,69 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
#ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char RCSid[] = "$Id: lookup.c,v 2.6 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* Table lookup routines
*/
+/* ====================================================================
+ * 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
#include "lookup.h"
#ifdef NOSTRUCTASS
@@ -17,11 +72,7 @@ static char SCCSid[] = "$SunId$ SGI";
#define copystruct(d,s) (*(d) = *(s))
#endif
-#define MEM_PTR char *
-extern MEM_PTR calloc();
-
-
int
lu_init(tbl, nel) /* initialize tbl for at least nel elements */
register LUTAB *tbl;
@@ -138,7 +189,7 @@ tryagain:
copystruct(lu_find(tbl,le[ndx].key), &le[ndx]);
else if (tbl->freek != NULL)
(*tbl->freek)(le[ndx].key);
- free((MEM_PTR)le);
+ free((void *)le);
goto tryagain; /* should happen only once! */
}
@@ -194,7 +245,7 @@ register LUTAB *tbl;
if (tp->data != NULL && tbl->freed != NULL)
(*tbl->freed)(tp->data);
}
- free((MEM_PTR)tbl->tabl);
+ free((void *)tbl->tabl);
tbl->tabl = NULL;
tbl->tsiz = 0;
tbl->ndel = 0;