--- ray/src/common/objset.c	2003/02/22 02:07:22	2.8
+++ ray/src/common/objset.c	2003/10/20 15:10:18	2.14
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: objset.c,v 2.8 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: objset.c,v 2.14 2003/10/20 15:10:18 greg Exp $";
 #endif
 /*
  *  objset.c - routines for maintaining object sets.
@@ -7,62 +7,7 @@ static const char	RCSid[] = "$Id: objset.c,v 2.8 2003/
  *  External symbols declared in object.h
  */
 
-/* ====================================================================
- * 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  "standard.h"
 
@@ -71,10 +16,10 @@ static const char	RCSid[] = "$Id: objset.c,v 2.8 2003/
 #include  "object.h"
 
 #ifndef  OSTSIZ
-#ifdef  BIGMEM
-#define  OSTSIZ		262139		/* object table size (a prime!) */
-#else
+#ifdef  SMLMEM
 #define  OSTSIZ		32749		/* object table size (a prime!) */
+#else
+#define  OSTSIZ		262139		/* object table size (a prime!) */
 #endif
 #endif
 
@@ -264,15 +209,16 @@ tryagain:
 		ot = oseti(i*OSTSIZ + osentry);
 		if (*os > 0)			/* found it */
 			return(ot);
-		if (!isfull(ot))		/* entry overflow */
+		if (!isfull(ot)) {		/* entry overflow */
 			if (++ntries < OSTSIZ)
 				goto tryagain;
 			else
 				error(INTERNAL, "hash table overflow in fullnode");
+		}
 						/* remember position */
 		i = os - ostable[osentry];
 		os = ostable[osentry] = (OBJECT *)realloc(
-				(char *)ostable[osentry],
+				(void *)ostable[osentry],
 				(unsigned)(i+oset[0]+2)*sizeof(OBJECT));
 		if (os == NULL)
 			goto memerr;
@@ -284,6 +230,7 @@ tryagain:
 	return(ot);
 memerr:
 	error(SYSTEM, "out of memory in fullnode");
+	return 0; /* pro forma return */
 }