--- ray/src/cv/mgflib/lookup.c	1998/09/04 09:05:09	1.7
+++ ray/src/cv/mgflib/lookup.c	2003/11/21 07:15:29	1.11
@@ -1,23 +1,16 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: lookup.c,v 1.11 2003/11/21 07:15:29 greg Exp $";
 #endif
-
 /*
  * Table lookup routines
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "lookup.h"
 
-#ifndef MEM_PTR
-#define MEM_PTR		void *
-#endif
 
-extern MEM_PTR	calloc();
-
-
 int
 lu_init(tbl, nel)		/* initialize tbl for at least nel elements */
 register LUTAB	*tbl;
@@ -79,7 +72,7 @@ char	*s;
 	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);
 }
@@ -129,12 +122,13 @@ tryagain:
 	 * 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! */
 }
 
@@ -157,6 +151,25 @@ char	*key;
 }
 
 
+int
+lu_doall(tbl, f)		/* loop through all valid table entries */
+register LUTAB	*tbl;
+int	(*f)(LUENT *);
+{
+	int	rval = 0;
+	register LUENT	*tp;
+
+	for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
+		if (tp->data != NULL) {
+			if (f != NULL)
+				rval += (*f)(tp);
+			else
+				rval++;
+		}
+	return(rval);
+}
+
+
 void
 lu_done(tbl)			/* free table and contents */
 register LUTAB	*tbl;
@@ -172,7 +185,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;