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

Comparing ray/src/cv/arch2rad.c (file contents):
Revision 1.2 by greg, Thu Dec 13 16:02:42 1990 UTC vs.
Revision 1.3 by greg, Mon Dec 17 14:43:08 1990 UTC

# Line 194 | Line 194 | FILE   *fp;
194   {
195          char    buf[MAXSTR];
196          int     i, n;
197 +        register int    c;
198                                          /* get file name */
199          if (fgets(buf, MAXSTR, fp) == NULL)
200                  goto readerr;
201 <        if ((n = strlen(buf)) < 1)
201 <                goto readerr;
202 <        buf[n-1] = '\0';
201 >        buf[strlen(buf)-1] = '\0';
202          fhead.filename = savestr(buf);
203                                          /* get layers */
204          fhead.layer[0] = "Worksheet";
205          for (i = 1; i <= 8; i++) {
206 <                if (fscanf(fp, "Layer No.%d", &n) != 1 || n != i)
206 >                if (fscanf(fp, "L%*[^0-8]%d", &n) != 1 || n != i)
207                          goto readerr;
208 <                while ((n = getc(fp)) != EOF && (n == ' ' || n == '\t'))
208 >                while ((c = getc(fp)) != EOF && (c == ' ' || c == '\t'))
209                          ;
210 <                if (n == EOF)
210 >                if (c == EOF)
211                          goto readerr;
212 <                ungetc(n, fp);
212 >                ungetc(c, fp);
213                  if (fgets(buf, MAXSTR, fp) == NULL)
214                          goto readerr;
215                  buf[strlen(buf)-1] = '\0';

Diff Legend

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