--- ray/src/common/otypes.c	1989/02/02 10:34:38	1.1
+++ ray/src/common/otypes.c	2003/02/25 02:47:21	2.3
@@ -1,15 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: otypes.c,v 2.3 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
- *  otypes.c - object lookup functions.
+ * Object type lookup and error reporting
  *
- *     7/29/85
+ *  External symbols declared in object.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -17,14 +16,6 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-FUN  ofun[NUMOTYPE] = INIT_OTYPE;	/* our object function table */
-
-static struct ohtab {
-	int  hsiz;			/* current table size */
-	OBJECT  *htab;			/* table, if allocated */
-}  modtab = {100, NULL}, objtab = {1000, NULL};	/* modifiers and objects */
-
-
 int
 otype(ofname)			/* get object function number from its name */
 register char  *ofname;
@@ -39,46 +30,7 @@ register char  *ofname;
 }
 
 
-#ifdef  GETOBJ
-int
-object(oname)			/* get an object number from its name */
-char  *oname;
-{
-	register int  ndx;
-
-	ndx = otndx(oname, &objtab);
-	return(objtab.htab[ndx]);
-}
-#endif
-
-
-int
-modifier(mname)			/* get a modifier number from its name */
-char  *mname;
-{
-	register int  ndx;
-
-	ndx = otndx(mname, &modtab);
-	return(modtab.htab[ndx]);
-}
-
-
-insertobject(obj)		/* insert new object into our list */
-register OBJECT  obj;
-{
-	register int  ndx;
-
-#ifdef  GETOBJ
-	ndx = otndx(objptr(obj)->oname, &objtab);
-	objtab.htab[ndx] = obj;
-#endif
-	if (ismodifier(objptr(obj)->otype)) {
-		ndx = otndx(objptr(obj)->oname, &modtab);
-		modtab.htab[ndx] = obj;
-	}
-}
-
-
+void
 objerror(o, etyp, msg)		/* report error related to object */
 OBJREC  *o;
 int  etyp;
@@ -89,72 +41,4 @@ char  *msg;
 	sprintf(msgbuf, "%s for %s \"%s\"",
 			msg, ofun[o->otype].funame, o->oname);
 	error(etyp, msgbuf);
-}
-
-
-static int
-nexthsiz(oldsiz)		/* return next hash table size */
-int  oldsiz;
-{
-	static int  hsiztab[] = {
-		251, 509, 1021, 2039, 4093, 8191, 16381, 0
-	};
-	register int  *hsp;
-
-	for (hsp = hsiztab; *hsp; hsp++)
-		if (*hsp > oldsiz)
-			return(*hsp);
-	return(oldsiz*2 + 1);		/* not always prime */
-}
-
-
-static int
-shash(s)			/* hash a string */
-register char  *s;
-{
-	register int  h = 0;
-
-	while (*s)
-		h = (h<<1 & 0x7fff) ^ *s++;
-	return(h);
-}
-
-
-static int
-otndx(name, tab)		/* get object table index for name */
-char  *name;
-register struct ohtab  *tab;
-{
-	OBJECT  *oldhtab;
-	int  hval, i;
-	register int  ndx;
-
-	if (tab->htab == NULL) {		/* new table */
-		tab->hsiz = nexthsiz(tab->hsiz);
-		tab->htab = (OBJECT *)malloc(tab->hsiz*sizeof(OBJECT));
-		if (tab->htab == NULL)
-			error(SYSTEM, "out of memory in tputo");
-		ndx = tab->hsiz;
-		while (ndx--)			/* empty it */
-			tab->htab[ndx] = OVOID;
-	}
-					/* look up object */
-	hval = shash(name);
-	for (i = 0; i < tab->hsiz; i++) {
-		ndx = (hval + i*i) % tab->hsiz;
-		if (tab->htab[ndx] == OVOID ||
-				!strcmp(objptr(tab->htab[ndx])->oname, name))
-			return(ndx);
-	}
-					/* table is full, reallocate */
-	oldhtab = tab->htab;
-	ndx = tab->hsiz;
-	tab->htab = NULL;
-	while (ndx--)
-		if (oldhtab[ndx] != OVOID) {
-			i = otndx(objptr(oldhtab[ndx])->oname, tab);
-			tab->htab[i] = oldhtab[ndx];
-		}
-	free((char *)oldhtab);
-	return(otndx(name, tab));
 }