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

Comparing ray/src/common/modobject.c (file contents):
Revision 2.7 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.13 by greg, Sat Mar 9 18:53:05 2013 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  Routines for tracking object modifiers
# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in object.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include  "standard.h"
13  
# Line 76 | Line 21 | static struct ohtab {
21          OBJECT  *htab;                  /* table, if allocated */
22   }  modtab = {100, NULL}, objtab = {1000, NULL}; /* modifiers and objects */
23  
24 < static int  otndx();
24 > static int  otndx(char *, struct ohtab *);
25  
26  
27 < int
28 < objndx(op)                      /* get object number from pointer */
29 < register OBJREC  *op;
27 > OBJECT
28 > objndx(                         /* get object number from pointer */
29 >        OBJREC  *op
30 > )
31   {
32 <        register int  i, j;
32 >        int  i, j;
33  
34          for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
35                  j = op - objblock[i];
36 <                if (j >= 0 && j < OBJBLKSIZ)
36 >                if ((j >= 0) & (j < OBJBLKSIZ))
37                          return((i<<OBJBLKSHFT) + j);
38          }
39          return(OVOID);
40   }
41  
42  
43 < int
44 < lastmod(obj, mname)             /* find modifier definition before obj */
45 < OBJECT  obj;
46 < char  *mname;
43 > OBJECT
44 > lastmod(                        /* find modifier definition before obj */
45 >        OBJECT  obj,
46 >        char  *mname
47 > )
48   {
49 <        register OBJREC  *op;
50 <        register int  i;
49 >        OBJREC  *op;
50 >        int  i;
51  
52          i = modifier(mname);            /* try hash table first */
53 <        if (i < obj)
53 >        if ((obj == OVOID) | (i < obj))
54                  return(i);
55          for (i = obj; i-- > 0; ) {      /* need to search */
56                  op = objptr(i);
57 <                if (ismodifier(op->otype) && !strcmp(op->oname, mname))
57 >                if (ismodifier(op->otype) && op->oname[0] == mname[0] &&
58 >                                        !strcmp(op->oname, mname))
59                          return(i);
60          }
61          return(OVOID);
62   }
63  
64  
65 < int
66 < modifier(mname)                 /* get a modifier number from its name */
67 < char  *mname;
65 > OBJECT
66 > modifier(                       /* get a modifier number from its name */
67 >        char  *mname
68 > )
69   {
70 <        register int  ndx;
70 >        int  ndx;
71  
72          ndx = otndx(mname, &modtab);
73          return(modtab.htab[ndx]);
# Line 126 | Line 75 | char  *mname;
75  
76  
77   #ifdef  GETOBJ
78 < int
79 < object(oname)                   /* get an object number from its name */
80 < char  *oname;
78 > OBJECT
79 > object(                         /* get an object number from its name */
80 >        char  *oname
81 > )
82   {
83 <        register int  ndx;
83 >        int  ndx;
84  
85          ndx = otndx(oname, &objtab);
86          return(objtab.htab[ndx]);
# Line 139 | Line 89 | char  *oname;
89  
90  
91   void
92 < insertobject(obj)               /* insert new object into our list */
93 < register OBJECT  obj;
92 > insertobject(                   /* insert new object into our list */
93 >        OBJECT  obj
94 > )
95   {
96 <        register int  i;
96 >        int  i;
97  
98          if (ismodifier(objptr(obj)->otype)) {
99                  i = otndx(objptr(obj)->oname, &modtab);
# Line 160 | Line 111 | register OBJECT  obj;
111  
112  
113   void
114 < clearobjndx()                   /* clear object hash tables */
114 > clearobjndx(void)               /* clear object hash tables */
115   {
116          if (modtab.htab != NULL) {
117                  free((void *)modtab.htab);
# Line 176 | Line 127 | clearobjndx()                  /* clear object hash tables */
127  
128  
129   static int
130 < nexthsiz(oldsiz)                /* return next hash table size */
131 < int  oldsiz;
130 > nexthsiz(                       /* return next hash table size */
131 >        int  oldsiz
132 > )
133   {
134          static int  hsiztab[] = {
135                  251, 509, 1021, 2039, 4093, 8191, 16381, 0
136          };
137 <        register int  *hsp;
137 >        int  *hsp;
138  
139          for (hsp = hsiztab; *hsp; hsp++)
140                  if (*hsp > oldsiz)
# Line 192 | Line 144 | int  oldsiz;
144  
145  
146   static int
147 < otndx(name, tab)                /* get object table index for name */
148 < char  *name;
149 < register struct ohtab  *tab;
147 > otndx(                          /* get object table index for name */
148 >        char  *name,
149 >        struct ohtab  *tab
150 > )
151   {
152          OBJECT  *oldhtab;
153          int  hval, i;
154 <        register int  ndx;
154 >        int  ndx;
155  
156          if (tab->htab == NULL) {                /* new table */
157                  tab->hsiz = nexthsiz(tab->hsiz);
# Line 213 | Line 166 | register struct ohtab  *tab;
166          hval = shash(name);
167   tryagain:
168          for (i = 0; i < tab->hsiz; i++) {
169 <                ndx = (hval + i*i) % tab->hsiz;
169 >                ndx = (hval + (unsigned long)i*i) % tab->hsiz;
170                  if (tab->htab[ndx] == OVOID ||
171                                  !strcmp(objptr(tab->htab[ndx])->oname, name))
172                          return(ndx);

Diff Legend

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