--- ray/src/common/lookup.c 2003/02/22 02:07:22 2.6 +++ ray/src/common/lookup.c 2010/05/01 21:49:42 2.17 @@ -1,82 +1,30 @@ #ifndef lint -static const char RCSid[] = "$Id: lookup.c,v 2.6 2003/02/22 02:07:22 greg Exp $"; +static const char RCSid[] = "$Id: lookup.c,v 2.17 2010/05/01 21:49:42 greg Exp $"; #endif /* * Table lookup routines */ -/* ==================================================================== - * 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 - * . - */ - #include #include +#include + #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, @@ -99,9 +47,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 */ + const void *s +) { static unsigned char shuffle[256] = { 0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34, @@ -131,7 +80,7 @@ char *s; }; register int i = 0; register unsigned long h = 0; - register unsigned char *t = (unsigned char *)s; + register unsigned const char *t = (unsigned const char *)s; while (*t) h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf); @@ -140,10 +89,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, + const char *key +) { unsigned long hval; int i, n; @@ -184,20 +134,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, + const char *key +) { register LUENT *le; @@ -212,27 +164,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;