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

Comparing src/common/modobject.c (file contents):
Revision 2.5 by gwlarson, Tue Aug 11 09:54:34 1998 UTC vs.
Revision 2.7 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  Routines for tracking object modifiers
6 + *
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 + */
66 +
67   #include  "standard.h"
68  
69   #include  "object.h"
# Line 15 | Line 71 | static char SCCSid[] = "$SunId$ LBL";
71   #include  "otypes.h"
72  
73  
18 – extern int  (*addobjnotify[])();        /* people to notify of new objects */
19 –
74   static struct ohtab {
75          int  hsiz;                      /* current table size */
76          OBJECT  *htab;                  /* table, if allocated */
# Line 31 | Line 85 | register OBJREC  *op;
85   {
86          register int  i, j;
87  
88 <        for (i = nobjects>>6; i >= 0; i--) {
88 >        for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
89                  j = op - objblock[i];
90 <                if (j >= 0 && j < 0100)
91 <                        return((i<<6) + j);
90 >                if (j >= 0 && j < OBJBLKSIZ)
91 >                        return((i<<OBJBLKSHFT) + j);
92          }
93          return(OVOID);
94   }
# Line 84 | Line 138 | char  *oname;
138   #endif
139  
140  
141 + void
142   insertobject(obj)               /* insert new object into our list */
143   register OBJECT  obj;
144   {
# Line 104 | Line 159 | register OBJECT  obj;
159   }
160  
161  
162 + void
163 + clearobjndx()                   /* clear object hash tables */
164 + {
165 +        if (modtab.htab != NULL) {
166 +                free((void *)modtab.htab);
167 +                modtab.htab = NULL;
168 +                modtab.hsiz = 100;
169 +        }
170 +        if (objtab.htab != NULL) {
171 +                free((void *)objtab.htab);
172 +                objtab.htab = NULL;
173 +                objtab.hsiz = 100;
174 +        }
175 + }
176 +
177 +
178   static int
179   nexthsiz(oldsiz)                /* return next hash table size */
180   int  oldsiz;
# Line 156 | Line 227 | tryagain:
227                          i = otndx(objptr(oldhtab[ndx])->oname, tab);
228                          tab->htab[i] = oldhtab[ndx];
229                  }
230 <        free((char *)oldhtab);
230 >        free((void *)oldhtab);
231          goto tryagain;                  /* should happen only once! */
232   }

Diff Legend

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