ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/lookup.c
(Generate patch)

Comparing ray/src/common/lookup.c (file contents):
Revision 2.10 by schorsch, Mon Jul 21 22:30:17 2003 UTC vs.
Revision 2.18 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Table lookup routines
6   */
7  
8 – #include "copyright.h"
9 –
8   #include <stdio.h>
9   #include <stdlib.h>
10 + #include <string.h>
11  
12   #include "lookup.h"
13  
14  
15   int
16 < lu_init(tbl, nel)               /* initialize tbl for at least nel elements */
17 < register LUTAB  *tbl;
18 < int     nel;
16 > lu_init(                /* initialize tbl for at least nel elements */
17 >        register LUTAB  *tbl,
18 >        int     nel
19 > )
20   {
21          static int  hsiztab[] = {
22                  31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
# Line 40 | Line 40 | int    nel;
40  
41  
42   unsigned long
43 < lu_shash(s)                     /* hash a nul-terminated string */
44 < char    *s;
43 > lu_shash(                       /* hash a nul-terminated string */
44 >        const char      *s
45 > )
46   {
47          static unsigned char shuffle[256] = {
48                  0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34,
# Line 71 | Line 72 | char   *s;
72          };
73          register int    i = 0;
74          register unsigned long  h = 0;
75 <        register unsigned char *t = (unsigned char *)s;
75 >        register unsigned const char *t = (unsigned const char *)s;
76  
77          while (*t)
78                  h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf);
# Line 81 | Line 82 | char   *s;
82  
83  
84   LUENT *
85 < lu_find(tbl, key)               /* find a table entry */
86 < register LUTAB  *tbl;
87 < char    *key;
85 > lu_find(                /* find a table entry */
86 >        register LUTAB  *tbl,
87 >        const char      *key
88 > )
89   {
90          unsigned long   hval;
91          int     i, n;
# Line 136 | Line 138 | tryagain:
138  
139  
140   void
141 < lu_delete(tbl, key)             /* delete a table entry */
142 < register LUTAB  *tbl;
143 < char    *key;
141 > lu_delete(              /* delete a table entry */
142 >        register LUTAB  *tbl,
143 >        const char      *key
144 > )
145   {
146          register LUENT  *le;
147  
# Line 154 | Line 157 | char   *key;
157  
158  
159   int
160 < lu_doall(tbl, f)                /* loop through all valid table entries */
161 < register LUTAB  *tbl;
162 < int     (*f)();
160 > lu_doall(               /* loop through all valid table entries */
161 >        register const LUTAB    *tbl,
162 >        /* int  (*f)(const LUENT *) */
163 >        lut_doallf_t *f,
164 >        void *p
165 > )
166   {
167          int     rval = 0;
168 <        register LUENT  *tp;
168 >        register const LUENT    *tp;
169  
170          for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
171                  if (tp->data != NULL) {
172 <                        if (f != NULL)
173 <                                rval += (*f)(tp);
174 <                        else
172 >                        if (f != NULL) {
173 >                                int     r = (*f)(tp, p);
174 >                                if (r < 0)
175 >                                        return(-1);
176 >                                rval += r;
177 >                        } else
178                                  rval++;
179                  }
180          return(rval);
# Line 173 | Line 182 | int    (*f)();
182  
183  
184   void
185 < lu_done(tbl)                    /* free table and contents */
186 < register LUTAB  *tbl;
185 > lu_done(                        /* free table and contents */
186 >        register LUTAB  *tbl
187 > )
188   {
189          register LUENT  *tp;
190  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines