--- ray/src/common/lookup.c	2003/02/25 02:47:21	2.7
+++ ray/src/common/lookup.c	2004/05/25 06:30:46	2.14
@@ -1,27 +1,29 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: lookup.c,v 2.7 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: lookup.c,v 2.14 2004/05/25 06:30:46 greg Exp $";
 #endif
 /*
  * Table lookup routines
  */
 
-#include "copyright.h"
-
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "lookup.h"
 
-#ifdef	NOSTRUCTASS
-#define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
-#else
-#define	 copystruct(d,s)	(*(d) = *(s))
-#endif
+extern int
+lu_strcmp(
+	const void *s1,
+	const void *s2
+)
+{
+	return strcmp((const char*)s1,(const char*)s2);
+}
 
-
-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, 
@@ -44,9 +46,10 @@ int	nel;
 }
 
 
-unsigned long
-lu_shash(s)			/* hash a nul-terminated string */
-char	*s;
+extern unsigned long
+lu_shash(			/* hash a nul-terminated string */
+	void	*s
+)
 {
 	static unsigned char shuffle[256] = {
 		0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34,
@@ -85,10 +88,11 @@ char	*s;
 }
 
 
-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,
+	char	*key
+)
 {
 	unsigned long	hval;
 	int	i, n;
@@ -129,20 +133,22 @@ tryagain:
 	 * recursive call to lu_find().
 	 */
 	while (ndx--)
-		if (le[ndx].key != NULL)
+		if (le[ndx].key != NULL) {
 			if (le[ndx].data != NULL)
-				copystruct(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((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,
+	char	*key
+)
 {
 	register LUENT	*le;
 
@@ -157,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 LUTAB	*tbl,
+	//int	(*f)(LUENT *)
+	lut_doallf_t *f,
+	void *p
+)
 {
 	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
+		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;