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

Comparing ray/src/common/loadvars.c (file contents):
Revision 2.1 by greg, Tue Dec 12 14:00:48 1995 UTC vs.
Revision 2.4 by greg, Fri Apr 19 09:09:28 1996 UTC

# Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18   extern char  *malloc(), *realloc();
19   #endif
20  
21 + extern char  *fgetline();
22  
23 +
24   loadvars(rfname)                /* load variables into vv from file */
25   char    *rfname;
26   {
# Line 76 | Line 78 | register char  *ass;
78          for (n = strlen(ass); n > 0; n--)
79                  if (!isspace(ass[n-1]))
80                          break;
81 <        if (!n && !nowarn) {
82 <                fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
83 <                                progname, varname);
81 >        if (!n) {
82 >                if (!nowarn)
83 >                        fprintf(stderr,
84 >                        "%s: warning - missing value for variable '%s'\n",
85 >                                        progname, varname);
86                  return;
87          }
88                                          /* match variable from list */
# Line 133 | Line 137 | char   *nam;
137  
138  
139   char *
140 < nvalue(vp, n)                   /* return nth variable value */
141 < VARIABLE        *vp;
140 > nvalue(vn, n)                   /* return nth variable value */
141 > register int    vn;
142   register int    n;
143   {
144          register char   *cp;
145  
146 <        if (vp == NULL | n < 0 | n >= vp->nass)
146 >        if (vval(vn) == NULL | n < 0 | n >= vdef(vn))
147                  return(NULL);
148 <        cp = vp->value;
148 >        cp = vval(vn);
149          while (n--)
150                  while (*cp++)
151                          ;
# Line 279 | Line 283 | register FILE  *fp;
283                  fputs("= ", fp);
284                  k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
285                                  - strlen(vnam(i)) ;
286 <                cp = nvalue(vv+i, j);
286 >                cp = nvalue(i, j);
287                  while (*cp) {
288                      putc(*cp++, fp);
289                      if (--k <= 0) {             /* line too long */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)