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

Comparing ray/src/common/vars.h (file contents):
Revision 2.2 by greg, Fri Jan 5 14:42:13 1996 UTC vs.
Revision 2.3 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 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   *  Header for programs that load variable files.
4   */
5  
6 + /* ====================================================================
7 + * The Radiance Software License, Version 1.0
8 + *
9 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 + *
12 + * Redistribution and use in source and binary forms, with or without
13 + * modification, are permitted provided that the following conditions
14 + * are met:
15 + *
16 + * 1. Redistributions of source code must retain the above copyright
17 + *         notice, this list of conditions and the following disclaimer.
18 + *
19 + * 2. Redistributions in binary form must reproduce the above copyright
20 + *       notice, this list of conditions and the following disclaimer in
21 + *       the documentation and/or other materials provided with the
22 + *       distribution.
23 + *
24 + * 3. The end-user documentation included with the redistribution,
25 + *           if any, must include the following acknowledgment:
26 + *             "This product includes Radiance software
27 + *                 (http://radsite.lbl.gov/)
28 + *                 developed by the Lawrence Berkeley National Laboratory
29 + *               (http://www.lbl.gov/)."
30 + *       Alternately, this acknowledgment may appear in the software itself,
31 + *       if and wherever such third-party acknowledgments normally appear.
32 + *
33 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 + *       and "The Regents of the University of California" must
35 + *       not be used to endorse or promote products derived from this
36 + *       software without prior written permission. For written
37 + *       permission, please contact [email protected].
38 + *
39 + * 5. Products derived from this software may not be called "Radiance",
40 + *       nor may "Radiance" appear in their name, without prior written
41 + *       permission of Lawrence Berkeley National Laboratory.
42 + *
43 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 + * SUCH DAMAGE.
55 + * ====================================================================
56 + *
57 + * This software consists of voluntary contributions made by many
58 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 + * information on Lawrence Berkeley National Laboratory, please see
60 + * <http://www.lbl.gov/>.
61 + */
62 +
63   typedef struct {
64          char    *name;          /* variable name */
65          short   nick;           /* # characters required for nickname */
66          short   nass;           /* # assignments made */
67          char    *value;         /* assigned value(s) */
68 <        int     (*fixval)();    /* assignment checking function */
68 >        void    (*fixval)();    /* assignment checking function */
69   } VARIABLE;             /* a variable-value pair */
70  
71   /**** The following variables should be declared by calling program ****/
# Line 26 | Line 80 | extern int     nowarn;         /* global boolean to turn warnings
80  
81   /**** The rest is declared in loadvars.c ****/
82  
29 extern int      onevalue(), catvalues(), boolvalue(),
30                qualvalue(), fltvalue(), intvalue();
31
83   extern VARIABLE *matchvar();
84   extern char     *nvalue();
85  
# Line 46 | Line 97 | extern char    *nvalue();
97   #define HIGH            'H'
98   #define MEDIUM          'M'
99   #define LOW             'L'
100 +
101 + #ifdef NOPROTO
102 +
103 + extern void     loadvars();
104 + extern int      setvariable();
105 + extern VARIABLE *matchvar();
106 + extern char     *nvalue();
107 + extern void     checkvalues();
108 + extern void     onevalue();
109 + extern void     catvalues();
110 + extern int      badmatch();
111 + extern void     boolvalue();
112 + extern void     qualvalue();
113 + extern void     intvalue();
114 + extern void     fltvalue();
115 + extern void     printvars();
116 +
117 + #else
118 +
119 + extern void     loadvars(char *rfname);
120 + extern int      setvariable(char *ass, VARIABLE *(*mv)());
121 + extern VARIABLE *matchvar(char *nam);
122 + extern char     *nvalue(int vn, int n);
123 + extern void     checkvalues(void);
124 + extern void     onevalue(VARIABLE *vp);
125 + extern void     catvalues(VARIABLE *vp);
126 + extern int      badmatch(char *tv, char *cv);
127 + extern void     boolvalue(VARIABLE *vp);
128 + extern void     qualvalue(VARIABLE *vp);
129 + extern void     intvalue(VARIABLE *vp);
130 + extern void     fltvalue(VARIABLE *vp);
131 + extern void     printvars(FILE *fp);
132 +
133 + #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines