--- ray/src/common/modobject.c 2003/02/22 02:07:22 2.7
+++ ray/src/common/modobject.c 2004/07/14 02:37:23 2.12
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: modobject.c,v 2.7 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: modobject.c,v 2.12 2004/07/14 02:37:23 greg Exp $";
#endif
/*
* Routines for tracking object modifiers
@@ -7,62 +7,7 @@ static const char RCSid[] = "$Id: modobject.c,v 2.7 20
* 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
- * .
- */
+#include "copyright.h"
#include "standard.h"
@@ -76,10 +21,10 @@ static struct ohtab {
OBJECT *htab; /* table, if allocated */
} modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
-static int otndx();
+static int otndx(char *, struct ohtab *);
-int
+OBJECT
objndx(op) /* get object number from pointer */
register OBJREC *op;
{
@@ -87,14 +32,14 @@ register OBJREC *op;
for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
j = op - objblock[i];
- if (j >= 0 && j < OBJBLKSIZ)
+ if ((j >= 0) & (j < OBJBLKSIZ))
return((i< 0; ) { /* need to search */
op = objptr(i);
@@ -114,7 +59,7 @@ char *mname;
}
-int
+OBJECT
modifier(mname) /* get a modifier number from its name */
char *mname;
{
@@ -126,7 +71,7 @@ char *mname;
#ifdef GETOBJ
-int
+OBJECT
object(oname) /* get an object number from its name */
char *oname;
{
@@ -213,7 +158,7 @@ register struct ohtab *tab;
hval = shash(name);
tryagain:
for (i = 0; i < tab->hsiz; i++) {
- ndx = (hval + i*i) % tab->hsiz;
+ ndx = (hval + (unsigned long)i*i) % tab->hsiz;
if (tab->htab[ndx] == OVOID ||
!strcmp(objptr(tab->htab[ndx])->oname, name))
return(ndx);