--- ray/src/common/lookup.c	1998/06/02 15:01:43	2.4
+++ ray/src/common/lookup.c	2003/07/30 10:11:06	2.11
@@ -1,21 +1,18 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: lookup.c,v 2.11 2003/07/30 10:11:06 schorsch Exp $";
 #endif
-
 /*
  * Table lookup routines
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "lookup.h"
 
-#define MEM_PTR		char *
 
-extern MEM_PTR	calloc();
-
-
 int
 lu_init(tbl, nel)		/* initialize tbl for at least nel elements */
 register LUTAB	*tbl;
@@ -42,7 +39,7 @@ int	nel;
 }
 
 
-long
+unsigned long
 lu_shash(s)			/* hash a nul-terminated string */
 char	*s;
 {
@@ -73,11 +70,11 @@ char	*s;
 		41, 198, 99
 	};
 	register int	i = 0;
-	register long	h = 0;
+	register unsigned long	h = 0;
 	register unsigned char *t = (unsigned char *)s;
 
 	while (*t)
-	    	h ^= (long)shuffle[*t++] << ((i+=11) & 0xf);
+	    	h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf);
 
 	return(h);
 }
@@ -88,18 +85,18 @@ lu_find(tbl, key)		/* find a table entry */
 register LUTAB	*tbl;
 char	*key;
 {
-	long	hval;
+	unsigned long	hval;
 	int	i, n;
 	register int	ndx;
 	register LUENT	*le;
 					/* look up object */
-	if (tbl->tsiz == 0)
-		lu_init(tbl, 1);
+	if (tbl->tsiz == 0 && !lu_init(tbl, 1))
+		return(NULL);
 	hval = (*tbl->hashf)(key);
 tryagain:
 	ndx = hval % tbl->tsiz;
-	le = &tbl->tabl[ndx];
 	for (i = 0, n = 1; i < tbl->tsiz; i++, n += 2) {
+		le = &tbl->tabl[ndx];
 		if (le->key == NULL) {
 			le->hval = hval;
 			return(le);
@@ -108,11 +105,8 @@ tryagain:
 		      (tbl->keycmp == NULL || !(*tbl->keycmp)(le->key, key))) {
 			return(le);
 		}
-		le += n;
-		if ((ndx += n) >= tbl->tsiz) {	/* this happens rarely */
+		if ((ndx += n) >= tbl->tsiz)	/* this happens rarely */
 			ndx = ndx % tbl->tsiz;
-			le = &tbl->tabl[ndx];
-		}
 	}
 					/* table is full, reallocate */
 	le = tbl->tabl;
@@ -124,20 +118,19 @@ tryagain:
 		tbl->ndel = i;
 		return(NULL);
 	}
-	if (!ndx)
-		goto tryagain;
 	/*
 	 * The following code may fail if the user has reclaimed many
 	 * deleted entries and the system runs out of memory in a
 	 * recursive call to lu_find().
 	 */
 	while (ndx--)
-		if (le[ndx].key != NULL)
+		if (le[ndx].key != NULL) {
 			if (le[ndx].data != NULL)
-				*lu_find(tbl, le[ndx].key) = le[ndx];
+				*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! */
 }
 
@@ -163,17 +156,18 @@ char	*key;
 int
 lu_doall(tbl, f)		/* loop through all valid table entries */
 register LUTAB	*tbl;
-int	(*f)();
+int	(*f)(LUENT *);
 {
 	int	rval = 0;
 	register LUENT	*tp;
 
 	for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
-		if (tp->data != NULL)
+		if (tp->data != NULL) {
 			if (f != NULL)
 				rval += (*f)(tp);
 			else
 				rval++;
+		}
 	return(rval);
 }
 
@@ -193,7 +187,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;