--- ray/src/common/lookup.c	1998/06/02 15:01:43	2.4
+++ ray/src/common/lookup.c	2004/05/25 22:04:13	2.15
@@ -1,25 +1,29 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: lookup.c,v 2.15 2004/05/25 22:04:13 greg Exp $";
 #endif
-
 /*
  * Table lookup routines
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "lookup.h"
 
-#define MEM_PTR		char *
+extern int
+lu_strcmp(
+	const void *s1,
+	const void *s2
+)
+{
+	return strcmp((const char*)s1,(const char*)s2);
+}
 
-extern MEM_PTR	calloc();
-
-
-int
-lu_init(tbl, nel)		/* initialize tbl for at least nel elements */
-register LUTAB	*tbl;
-int	nel;
+extern int
+lu_init(		/* initialize tbl for at least nel elements */
+	register LUTAB	*tbl,
+	int	nel
+)
 {
 	static int  hsiztab[] = {
 		31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, 
@@ -42,9 +46,10 @@ int	nel;
 }
 
 
-long
-lu_shash(s)			/* hash a nul-terminated string */
-char	*s;
+extern unsigned long
+lu_shash(			/* hash a nul-terminated string */
+	const void	*s
+)
 {
 	static unsigned char shuffle[256] = {
 		0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34,
@@ -73,33 +78,34 @@ char	*s;
 		41, 198, 99
 	};
 	register int	i = 0;
-	register long	h = 0;
-	register unsigned char *t = (unsigned char *)s;
+	register unsigned long	h = 0;
+	register unsigned const char *t = (unsigned const char *)s;
 
 	while (*t)
-	    	h ^= (long)shuffle[*t++] << ((i+=11) & 0xf);
+	    	h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf);
 
 	return(h);
 }
 
 
-LUENT *
-lu_find(tbl, key)		/* find a table entry */
-register LUTAB	*tbl;
-char	*key;
+extern LUENT *
+lu_find(		/* find a table entry */
+	register LUTAB	*tbl,
+	const 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 +114,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,28 +127,28 @@ 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! */
 }
 
 
-void
-lu_delete(tbl, key)		/* delete a table entry */
-register LUTAB	*tbl;
-char	*key;
+extern void
+lu_delete(		/* delete a table entry */
+	register LUTAB	*tbl,
+	const char	*key
+)
 {
 	register LUENT	*le;
 
@@ -160,27 +163,35 @@ char	*key;
 }
 
 
-int
-lu_doall(tbl, f)		/* loop through all valid table entries */
-register LUTAB	*tbl;
-int	(*f)();
+extern int
+lu_doall(		/* loop through all valid table entries */
+	register const LUTAB	*tbl,
+	//int	(*f)(const LUENT *)
+	lut_doallf_t *f,
+	void *p
+)
 {
 	int	rval = 0;
-	register LUENT	*tp;
+	register const LUENT	*tp;
 
 	for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
-		if (tp->data != NULL)
-			if (f != NULL)
-				rval += (*f)(tp);
-			else
+		if (tp->data != NULL) {
+			if (f != NULL) {
+				int	r = (*f)(tp, p);
+				if (r < 0)
+					return(-1);
+				rval += r;
+			} else
 				rval++;
+		}
 	return(rval);
 }
 
 
-void
-lu_done(tbl)			/* free table and contents */
-register LUTAB	*tbl;
+extern void
+lu_done(			/* free table and contents */
+	register LUTAB	*tbl
+)
 {
 	register LUENT	*tp;
 
@@ -193,7 +204,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;