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

Comparing ray/src/common/readobj.c (file contents):
Revision 2.7 by gwlarson, Thu Nov 5 16:51:26 1998 UTC vs.
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1994 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   *  readobj.c - routines for reading in object descriptions.
6   *
7 < *     7/28/85
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 18 | Line 72 | static char SCCSid[] = "$SunId$ LBL";
72  
73   #include  <ctype.h>
74  
21 – extern char  *fgetword(), *strcpy();
22 –
75   OBJREC  *objblock[MAXOBJBLK];           /* our objects */
76   OBJECT  nobjects = 0;                   /* # of objects */
77  
78  
79 + void
80   readobj(inpspec)                /* read in an object file or stream */
81   char  *inpspec;
82   {
30 –        FILE  *popen();
31 –        char  *fgetline();
83          OBJECT  lastobj;
84          FILE  *infp;
85          char  buf[1024];
# Line 72 | Line 123 | char  *inpspec;
123   }
124  
125  
126 + void
127   getobject(name, fp)                     /* read the next object */
128   char  *name;
129   FILE  *fp;
# Line 143 | Line 195 | newobject()                            /* get a new object */
195                  i = nobjects >> OBJBLKSHFT;
196                  if (i >= MAXOBJBLK)
197                          return(OVOID);
198 <                objblock[i] = (OBJREC *)bmalloc(OBJBLKSIZ*sizeof(OBJREC));
198 >                objblock[i] = (OBJREC *)calloc(OBJBLKSIZ, sizeof(OBJREC));
199                  if (objblock[i] == NULL)
200                          return(OVOID);
201          }
202          return(nobjects++);
203 + }
204 +
205 + void
206 + freeobjects(firstobj, nobjs)            /* free a range of objects */
207 + OBJECT  firstobj, nobjs;
208 + {
209 +        register int  obj;
210 +                                        /* check bounds */
211 +        if (firstobj < 0)
212 +                return;
213 +        if (nobjs <= 0)
214 +                return;
215 +        if (firstobj + nobjs > nobjects)
216 +                return;
217 +                                        /* clear objects */
218 +        for (obj = firstobj+nobjs; obj-- > firstobj; ) {
219 +                register OBJREC  *o = objptr(obj);
220 +                free_os(o);             /* free client memory */
221 +                freeqstr(o->oname);
222 +                freefargs(&o->oargs);
223 +                bzero(o, sizeof(OBJREC));
224 +        }
225 +        clearobjndx();
226 +                                        /* free objects off end */
227 +        for (obj = nobjects; obj-- > 0; )
228 +                if (objptr(obj)->oname != NULL)
229 +                        break;
230 +        ++obj;
231 +        while (nobjects > obj)          /* free empty end blocks */
232 +                if ((--nobjects & (OBJBLKSIZ-1)) == 0) {
233 +                        int     i = nobjects >> OBJBLKSHFT;
234 +                        free((void *)objblock[i]);
235 +                        objblock[i] = NULL;
236 +                }
237   }

Diff Legend

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