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

Comparing ray/src/common/loadvars.c (file contents):
Revision 2.8 by gwlarson, Thu Jul 9 10:47:59 1998 UTC vs.
Revision 2.9 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1995 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 loading and checking variables from file.
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 +
65   #include <stdio.h>
66 + #include <stdlib.h>
67   #include <ctype.h>
68   #include "vars.h"
69  
70   #define NOCHAR  127             /* constant for character to delete */
71  
17 – #ifndef malloc
18 – extern char  *malloc(), *realloc();
19 – #endif
20 –
72   extern char  *fgetline();
73  
74  
75 + void
76   loadvars(rfname)                /* load variables into vv from file */
77   char    *rfname;
78   {
# Line 97 | Line 149 | VARIABLE       *(*mv)();
149                          while (*cp++)
150                                  ;
151                  i = cp - vp->value;
152 <                vp->value = realloc(vp->value, i+n+1);
152 >                vp->value = (char *)realloc(vp->value, i+n+1);
153          } else
154 <                vp->value = malloc(n+1);
154 >                vp->value = (char *)malloc(n+1);
155          if (vp->value == NULL) {
156                  perror(progname);
157                  quit(1);
# Line 151 | Line 203 | register int   n;
203   }
204  
205  
206 + void
207   checkvalues()                   /* check assignments */
208   {
209          register int    i;
# Line 161 | Line 214 | checkvalues()                  /* check assignments */
214   }
215  
216  
217 + void
218   onevalue(vp)                    /* only one assignment for this variable */
219   register VARIABLE       *vp;
220   {
# Line 176 | Line 230 | register VARIABLE      *vp;
230   }
231  
232  
233 + void
234   catvalues(vp)                   /* concatenate variable values */
235   register VARIABLE       *vp;
236   {
# Line 204 | Line 259 | register char  *tv, *cv;
259   }
260  
261  
262 + void
263   boolvalue(vp)                   /* check boolean for legal values */
264   register VARIABLE       *vp;
265   {
# Line 223 | Line 279 | register VARIABLE      *vp;
279   }
280  
281  
282 + void
283   qualvalue(vp)                   /* check qualitative var. for legal values */
284   register VARIABLE       *vp;
285   {
# Line 245 | Line 302 | register VARIABLE      *vp;
302   }
303  
304  
305 + void
306   intvalue(vp)                    /* check integer variable for legal values */
307   register VARIABLE       *vp;
308   {
# Line 257 | Line 315 | register VARIABLE      *vp;
315   }
316  
317  
318 + void
319   fltvalue(vp)                    /* check float variable for legal values */
320   register VARIABLE       *vp;
321   {
# Line 269 | Line 328 | register VARIABLE      *vp;
328   }
329  
330  
331 + void
332   printvars(fp)                   /* print variable values */
333   register FILE   *fp;
334   {

Diff Legend

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