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

Comparing ray/src/common/readoct.c (file contents):
Revision 1.3 by greg, Tue Mar 21 15:54:45 1989 UTC vs.
Revision 1.6 by greg, Tue Sep 19 13:40:48 1989 UTC

# Line 59 | Line 59 | char  *ofn[];
59                  getheader(infp, NULL);
60                                          /* check format */
61          if (getint(2) != OCTMAGIC)
62 <                octerror(USER, "bad octree");
62 >                octerror(USER, "invalid octree format");
63                                          /* get boundaries */
64          if (load & IO_BOUNDS) {
65                  for (i = 0; i < 3; i++)
# Line 139 | Line 139 | register int  siz;
139          register int  c;
140          register long  r;
141  
142 <        c = getc(infp);
143 <        r = c&0x80 ? -1L : 0L;          /* sign extend */
144 <        ungetc(c, infp);
145 <        while (siz--) {
142 >        if ((c = getc(infp)) == EOF)
143 >                goto end_file;
144 >        r = 0x80&c ? -1<<8|c : c;               /* sign extend */
145 >        while (--siz > 0) {
146                  if ((c = getc(infp)) == EOF)
147 <                        octerror(USER, "truncated octree");
147 >                        goto end_file;
148                  r <<= 8;
149                  r |= c;
150          }
151          return(r);
152 + end_file:
153 +        octerror(USER, "truncated octree");
154   }
155  
156  
# Line 159 | Line 161 | getflt()                       /* get a floating point number */
161          double  d;
162  
163          d = (double)getint(4)/0x7fffffff;
164 <        return(ldexp(d, getint(1)));    /* sign extend */
164 >        return(ldexp(d, getint(1)));
165   }
166          
167  

Diff Legend

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