--- ray/src/common/modobject.c	1996/12/15 15:45:17	2.4
+++ ray/src/common/modobject.c	2003/09/30 00:13:58	2.11
@@ -1,13 +1,14 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: modobject.c,v 2.11 2003/09/30 00:13:58 greg Exp $";
 #endif
-
 /*
  *  Routines for tracking object modifiers
+ *
+ *  External symbols declared in object.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -15,32 +16,30 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-extern int  (*addobjnotify[])();	/* people to notify of new objects */
-
 static struct ohtab {
 	int  hsiz;			/* current table size */
 	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;
 {
 	register int  i, j;
 
-	for (i = nobjects>>6; i >= 0; i--) {
+	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
 		j = op - objblock[i];
-		if (j >= 0 && j < 077)
-			return((i<<6) + j);
+		if (j >= 0 && j < OBJBLKSIZ)
+			return((i<<OBJBLKSHFT) + j);
 	}
 	return(OVOID);
 }
 
 
-int
+OBJECT
 lastmod(obj, mname)		/* find modifier definition before obj */
 OBJECT  obj;
 char  *mname;
@@ -60,7 +59,7 @@ char  *mname;
 }
 
 
-int
+OBJECT
 modifier(mname)			/* get a modifier number from its name */
 char  *mname;
 {
@@ -72,7 +71,7 @@ char  *mname;
 
 
 #ifdef  GETOBJ
-int
+OBJECT
 object(oname)			/* get an object number from its name */
 char  *oname;
 {
@@ -84,6 +83,7 @@ char  *oname;
 #endif
 
 
+void
 insertobject(obj)		/* insert new object into our list */
 register OBJECT  obj;
 {
@@ -104,6 +104,22 @@ register OBJECT  obj;
 }
 
 
+void
+clearobjndx()			/* clear object hash tables */
+{
+	if (modtab.htab != NULL) {
+		free((void *)modtab.htab);
+		modtab.htab = NULL;
+		modtab.hsiz = 100;
+	}
+	if (objtab.htab != NULL) {
+		free((void *)objtab.htab);
+		objtab.htab = NULL;
+		objtab.hsiz = 100;
+	}
+}
+
+
 static int
 nexthsiz(oldsiz)		/* return next hash table size */
 int  oldsiz;
@@ -142,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);
@@ -156,6 +172,6 @@ tryagain:
 			i = otndx(objptr(oldhtab[ndx])->oname, tab);
 			tab->htab[i] = oldhtab[ndx];
 		}
-	free((char *)oldhtab);
+	free((void *)oldhtab);
 	goto tryagain;			/* should happen only once! */
 }