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.5 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.12 by greg, Sat Jun 7 05:09:45 2025 UTC

# Line 8 | Line 8
8   extern "C" {
9   #endif
10  
11 < #include "copyright.h"
12 <
13 < typedef struct {
14 <        char    *name;          /* variable name */
11 > typedef struct variable_s {
12 >        const char      *name;  /* variable name */
13          short   nick;           /* # characters required for nickname */
14          short   nass;           /* # assignments made */
15          char    *value;         /* assigned value(s) */
16 <        void    (*fixval)();    /* assignment checking function */
16 >        void    (*fixval)(struct variable_s *); /* assignment checking function */
17   } VARIABLE;             /* a variable-value pair */
18  
19   /**** The following variables should be declared by calling program ****/
# Line 24 | Line 22 | extern int     NVARS;          /* total number of variables */
22  
23   extern VARIABLE vv[];           /* variable-value pairs */
24  
27 extern char     *progname;      /* global argv[0] from main */
28
25   extern int      nowarn;         /* global boolean to turn warnings off */
26  
27   /**** The rest is declared in loadvars.c ****/
28  
33 extern VARIABLE *matchvar();
34 extern char     *nvalue();
35
29   #define UPPER(c)        ((c)&~0x20)     /* ASCII trick */
30  
31   #define vnam(vc)        (vv[vc].name)
# Line 49 | Line 42 | extern char    *nvalue();
42   #define LOW             'L'
43  
44  
45 < extern void     loadvars(char *rfname);
46 < extern int      setvariable(char *ass, VARIABLE *(*mv)());
47 < extern VARIABLE *matchvar(char *nam);
45 > extern void     loadvars(const char *rfname);
46 > extern int      setvariable(const char *ass, VARIABLE *(*mv)(const char*));
47 > extern VARIABLE *matchvar(const char *nam);
48   extern char     *nvalue(int vn, int n);
49   extern void     checkvalues(void);
50   extern void     onevalue(VARIABLE *vp);
# Line 59 | Line 52 | extern void    catvalues(VARIABLE *vp);
52   extern int      badmatch(char *tv, char *cv);
53   extern void     boolvalue(VARIABLE *vp);
54   extern void     qualvalue(VARIABLE *vp);
55 + extern void     strvalue(VARIABLE *vp);
56   extern void     intvalue(VARIABLE *vp);
57   extern void     fltvalue(VARIABLE *vp);
58 + extern int      singlevar(VARIABLE *vp);
59   extern void     printvars(FILE *fp);
60  
66
61   #ifdef __cplusplus
62   }
63   #endif
64   #endif /* _RAD_VARS_H_ */
71

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines