--- ray/src/common/lookup.h	2003/02/22 02:07:22	2.6
+++ ray/src/common/lookup.h	2004/03/28 20:33:12	2.12
@@ -1,65 +1,20 @@
-/* RCSid: $Id: lookup.h,v 2.6 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: lookup.h,v 2.12 2004/03/28 20:33:12 schorsch Exp $ */
 /*
  * Header file for general associative table lookup routines
  */
+#ifndef _RAD_LOOKUP_H_
+#define _RAD_LOOKUP_H_
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include <string.h> /* strcmp() */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void lut_free_t(void *p);
+typedef unsigned long lut_hashf_t(void*);
+typedef int lut_keycmpf_t(const void*, const void*);
+
 typedef struct {
 	char	*key;			/* key name */
 	unsigned long	hval;		/* key hash value (for efficiency) */
@@ -67,18 +22,15 @@ typedef struct {
 } LUENT;
 
 typedef struct {
-	unsigned long	(*hashf)();	/* key hash function */
-	int	(*keycmp)();		/* key comparison function */
-	void	(*freek)();		/* free a key */
-	void	(*freed)();		/* free the data */
+	lut_hashf_t *hashf;	/* key hash function */
+	lut_keycmpf_t *keycmp;	/* 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;
 
-#undef strcmp
-#define LU_SINIT(fk,fd)		{lu_shash,strcmp,(void (*)())(fk),\
-				(void (*)())(fd),0,NULL,0}
 
 /*
  * The lu_init routine is called to initialize a table.  The number of
@@ -127,24 +79,20 @@ typedef struct {
  * allocated table itself.
  */
 
-extern int	strcmp();
+typedef int lut_doallf_t(LUENT *p);
 
-#ifdef NOPROTO
-
-extern int	lu_init();
-extern LUENT	*lu_find();
-extern void	lu_delete();
-extern int	lu_doall();
-extern void	lu_done();
-extern unsigned long	lu_shash();
-
-#else
-
+extern lut_keycmpf_t lu_strcmp;
 extern int	lu_init(LUTAB *tbl, int nel);
-extern unsigned long	lu_shash(char *s);
+extern unsigned long	lu_shash(void *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)());
+extern int	lu_doall(LUTAB *tbl, lut_doallf_t *f);
 extern void	lu_done(LUTAB *tbl);
 
+#define LU_SINIT(fk,fd) {lu_shash,lu_strcmp,fk,fd,0,NULL,0}
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_LOOKUP_H_ */
+