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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.15 by greg, Fri Mar 14 21:27:46 2003 UTC vs.
Revision 2.19 by greg, Wed Jul 16 01:32:53 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  <stdio.h>
11 > #include  <time.h>
12  
13 + #include  "standard.h"
14 + #include  "platform.h"
15   #include  "octree.h"
13
16   #include  "object.h"
15
17   #include  "otypes.h"
18 + #include  "resolu.h"
19  
20   static double  ogetflt();
21   static long  ogetint();
22   static char  *ogetstr();
23   static int  nonsurfinset();
24 < static int  octerror(), skiptree();
24 > static void  octerror(int  etyp, char  *msg);
25 > static void  skiptree(void);
26   static OCTREE  getfullnode(), gettree();
27  
28   static char  *infn;                     /* input file specification */
# Line 58 | Line 61 | char  *ofn[];
61                          error(SYSTEM, errmsg);
62                  }
63          }
64 < #ifdef MSDOS
62 <        setmode(fileno(infp), O_BINARY);
63 < #endif
64 >        SET_FILE_BINARY(infp);
65                                          /* get header */
66          if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
67                  octerror(USER, "not an octree");
# Line 199 | Line 200 | gettree()                      /* get a pre-ordered octree */
200          default:
201                  octerror(USER, "damaged octree");
202          }
203 +        return NULL; /* pro forma return */
204   }
205  
206  
# Line 217 | Line 219 | register OBJECT  *os;
219   }
220  
221  
222 < static
223 < skiptree()                              /* skip octree on input */
222 > static void
223 > skiptree(void)                          /* skip octree on input */
224   {
225          register int  i;
226          
# Line 242 | Line 244 | skiptree()                             /* skip octree on input */
244   }
245  
246  
247 < static
247 > static void
248   octerror(etyp, msg)                     /* octree error */
249   int  etyp;
250   char  *msg;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines