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

Comparing ray/src/rt/func.c (file contents):
Revision 1.4 by greg, Tue Apr 11 13:30:29 1989 UTC vs.
Revision 1.7 by greg, Thu Oct 5 07:23:22 1989 UTC

# Line 66 | Line 66 | RAY  *r;
66          register XF  *mxf;
67  
68          if ((mxf = (XF *)m->os) == NULL) {
69 <                register int  n = m->oargs.nsargs;
70 <                register char  **sa = m->oargs.sarg;
69 >                register int  n;
70 >                register char  **sa;
71  
72 <                while (n > 0 && **sa != '-') {
73 <                        n--;
74 <                        sa++;
75 <                }
72 >                for (n = m->oargs.nsargs, sa = m->oargs.sarg;
73 >                                n > 0 && **sa != '-'; n--, sa++)
74 >                        ;
75                  mxf = (XF *)malloc(sizeof(XF));
76                  if (mxf == NULL)
77                          goto memerr;
79                mxf->sca = 1.0;
80                setident4(mxf->xfm);
78                  if (invxf(mxf->xfm, &mxf->sca, n, sa) != n)
79                          objerror(m, USER, "bad transform");
80                  if (mxf->sca < 0.0)
# Line 98 | Line 95 | char  *fname;
95          extern char  *libpath;          /* library search path */
96          char  *ffname;
97  
98 <        if ((ffname = getpath(fname, libpath)) == NULL) {
98 >        if ((ffname = getpath(fname, libpath, R_OK)) == NULL) {
99                  sprintf(errmsg, "cannot find function file \"%s\"", fname);
100                  error(USER, errmsg);
101          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines