--- ray/src/cv/mgflib/lookup.h	1996/06/24 09:14:36	1.7
+++ ray/src/cv/mgflib/lookup.h	2003/11/15 17:54:06	1.12
@@ -1,41 +1,37 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: lookup.h,v 1.12 2003/11/15 17:54:06 schorsch Exp $ */
 /*
  * Header file for general associative table lookup routines
  */
+#ifndef _RAD_LOOKUP_H_
+#define _RAD_LOOKUP_H_
 
+#include <string.h> /* strcmp() */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void lut_free_t(void*);
+
 typedef struct {
-	char	*key;		/* key name */
-	long	hval;		/* key hash value (for efficiency) */
-	char	*data;		/* pointer to client data */
+	char	*key;			/* key name */
+	unsigned long	hval;		/* key hash value (for efficiency) */
+	char	*data;			/* pointer to client data */
 } LUENT;
 
-#ifdef NOPROTO
 typedef struct {
-	long	(*hashf)();	/* key hash function */
-	int	(*keycmp)();	/* key comparison function */
-	void	(*freek)();	/* free a key */
-	void	(*freed)();	/* free the data */
-	int	tsiz;		/* current table size */
-	LUENT	*tabl;		/* table, if allocated */
-	int	ndel;		/* number of deleted entries */
+	unsigned long (*hashf)(char*);	/* key hash function */
+	int (*keycmp)(const char*, const char*);	/* key comparison function */
+	lut_free_t *freek;		/* free a key */
+	lut_free_t *freed;		/* free the data */
+	int	tsiz;			/* current table size */
+	LUENT	*tabl;			/* table, if allocated */
+	int	ndel;			/* number of deleted entries */
 } LUTAB;
-#else
-typedef struct {
-	long	(*hashf)();	/* key hash function */
-	int	(*keycmp)(const char *, const char *);	/* key comparison function */
-	void	(*freek)(char *);	/* free a key */
-	void	(*freed)(char *);	/* free the data */
-	int	tsiz;		/* current table size */
-	LUENT	*tabl;		/* table, if allocated */
-	int	ndel;		/* number of deleted entries */
-} LUTAB;
-#endif
 
-#define LU_SINIT(fk,fd)		{lu_shash,strcmp,(void (*)())(fk),\
-				(void (*)())(fd),0,NULL,0}
+#undef strcmp
+#define LU_SINIT(fk,fd)		{lu_shash,strcmp,fk,\
+				fd,0,NULL,0}
 
 /*
  * The lu_init routine is called to initialize a table.  The number of
@@ -71,6 +67,12 @@ typedef struct {
  * It is therefore an error to reuse or do anything with the key
  * field after calling lu_delete.
  *
+ * The lu_doall routine loops through every filled table entry, calling
+ * the given function once on each entry.  If a NULL pointer is passed
+ * for this function, then lu_doall simply returns the total number of
+ * active entries.  Otherwise, it returns the sum of all the function
+ * evaluations.
+ *
  * The lu_done routine calls the given free function once for each
  * assigned table entry (i.e. each entry with an assigned key value).
  * The user must define these routines to free the key and the data
@@ -78,18 +80,16 @@ typedef struct {
  * allocated table itself.
  */
 
-#ifdef NOPROTO
-extern int	lu_init();
-extern LUENT	*lu_find();
-extern void	lu_delete();
-extern void	lu_done();
-extern long	lu_shash();
-extern int	strcmp();
-#else
-extern int	lu_init(LUTAB *, int);
-extern LUENT	*lu_find(LUTAB *, char *);
-extern void	lu_delete(LUTAB *, char *);
-extern void	lu_done(LUTAB *);
-extern long	lu_shash(char *);
-extern int	strcmp(char *, char *);
+extern int	lu_init(LUTAB *tbl, int nel);
+extern unsigned long	lu_shash(char *s);
+extern LUENT	*lu_find(LUTAB *tbl, char *key);
+extern void	lu_delete(LUTAB *tbl, char *key);
+extern int	lu_doall(LUTAB *tbl, int (*f)(LUENT*));
+extern void	lu_done(LUTAB *tbl);
+
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_LOOKUP_H_ */
+