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.6 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.12 by greg, Fri Nov 21 07:15:29 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Table lookup routines
6   */
7  
8 /* ====================================================================
9 * The Radiance Software License, Version 1.0
10 *
11 * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 *
14 * Redistribution and use in source and binary forms, with or without
15 * modification, are permitted provided that the following conditions
16 * are met:
17 *
18 * 1. Redistributions of source code must retain the above copyright
19 *         notice, this list of conditions and the following disclaimer.
20 *
21 * 2. Redistributions in binary form must reproduce the above copyright
22 *       notice, this list of conditions and the following disclaimer in
23 *       the documentation and/or other materials provided with the
24 *       distribution.
25 *
26 * 3. The end-user documentation included with the redistribution,
27 *           if any, must include the following acknowledgment:
28 *             "This product includes Radiance software
29 *                 (http://radsite.lbl.gov/)
30 *                 developed by the Lawrence Berkeley National Laboratory
31 *               (http://www.lbl.gov/)."
32 *       Alternately, this acknowledgment may appear in the software itself,
33 *       if and wherever such third-party acknowledgments normally appear.
34 *
35 * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 *       and "The Regents of the University of California" must
37 *       not be used to endorse or promote products derived from this
38 *       software without prior written permission. For written
39 *       permission, please contact [email protected].
40 *
41 * 5. Products derived from this software may not be called "Radiance",
42 *       nor may "Radiance" appear in their name, without prior written
43 *       permission of Lawrence Berkeley National Laboratory.
44 *
45 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 * SUCH DAMAGE.
57 * ====================================================================
58 *
59 * This software consists of voluntary contributions made by many
60 * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 * information on Lawrence Berkeley National Laboratory, please see
62 * <http://www.lbl.gov/>.
63 */
64
8   #include <stdio.h>
9   #include <stdlib.h>
10 +
11   #include "lookup.h"
12  
69 #ifdef  NOSTRUCTASS
70 #define  copystruct(d,s)        bcopy((char *)(s),(char *)(d),sizeof(*(d)))
71 #else
72 #define  copystruct(d,s)        (*(d) = *(s))
73 #endif
13  
75
14   int
15   lu_init(tbl, nel)               /* initialize tbl for at least nel elements */
16   register LUTAB  *tbl;
# Line 184 | Line 122 | tryagain:
122           * recursive call to lu_find().
123           */
124          while (ndx--)
125 <                if (le[ndx].key != NULL)
125 >                if (le[ndx].key != NULL) {
126                          if (le[ndx].data != NULL)
127 <                                copystruct(lu_find(tbl,le[ndx].key), &le[ndx]);
127 >                                *lu_find(tbl,le[ndx].key) = le[ndx];
128                          else if (tbl->freek != NULL)
129                                  (*tbl->freek)(le[ndx].key);
130 +                }
131          free((void *)le);
132          goto tryagain;                  /* should happen only once! */
133   }
# Line 215 | Line 154 | char   *key;
154   int
155   lu_doall(tbl, f)                /* loop through all valid table entries */
156   register LUTAB  *tbl;
157 < int     (*f)();
157 > int     (*f)(LUENT *);
158   {
159          int     rval = 0;
160          register LUENT  *tp;
161  
162          for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
163 <                if (tp->data != NULL)
163 >                if (tp->data != NULL) {
164                          if (f != NULL)
165                                  rval += (*f)(tp);
166                          else
167                                  rval++;
168 +                }
169          return(rval);
170   }
171  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines