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

Comparing ray/src/rt/rvmain.c (file contents):
Revision 2.2 by greg, Tue Feb 25 02:47:23 2003 UTC vs.
Revision 2.4 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "ray.h"
10 > #include  <signal.h>
11  
12 + #include  "platform.h"
13 + #include  "ray.h"
14   #include  "source.h"
13 –
15   #include  "ambient.h"
16 <
16 > #include  "rpaint.h"
17   #include  "random.h"
17 –
18   #include  "paths.h"
19 –
20 – #include  <signal.h>
21 –
19   #include  "view.h"
20  
21   char  *progname;                        /* argv[0] */
# Line 45 | Line 42 | extern int  vresolu;                   /* vertical resolution */
42   extern int  psample;                    /* pixel sample size */
43   extern double  maxdiff;                 /* max. sample difference */
44  
45 < void    onsig();
46 < void    sigdie();
47 < void    printdefaults();
45 > static void onsig(int  signo);
46 > static void sigdie(int  signo, char  *msg);
47 > static void printdefaults(void);
48  
49  
50   int
51 < main(argc, argv)
55 < int  argc;
56 < char  *argv[];
51 > main(int  argc, char  *argv[])
52   {
53   #define  check(ol,al)           if (argv[i][ol] || \
54                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 207 | Line 202 | char  *argv[];
202          if (octname == NULL)
203                  error(USER, "missing octree argument");
204                                          /* set up output */
205 < #ifdef  MSDOS
211 <        setmode(fileno(stdout), O_BINARY);
212 < #endif
205 >        SET_FILE_BINARY(stdout);
206          readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
207          nsceneobjs = nobjects;
208  
# Line 226 | Line 219 | char  *argv[];
219   badopt:
220          sprintf(errmsg, "command line error at '%s'", argv[i]);
221          error(USER, errmsg);
222 +        return 1; /* pro forma return */
223  
224   #undef  check
225   #undef  bool
# Line 233 | Line 227 | badopt:
227  
228  
229   void
230 < wputs(s)                                /* warning output function */
231 < char    *s;
230 > wputs(                          /* warning output function */
231 >        char    *s
232 > )
233   {
234          int  lasterrno = errno;
235          eputs(s);
# Line 243 | Line 238 | char   *s;
238  
239  
240   void
241 < eputs(s)                                /* put string to stderr */
242 < register char  *s;
241 > eputs(                          /* put string to stderr */
242 >        register char  *s
243 > )
244   {
245          static int  midline = 0;
246  
# Line 262 | Line 258 | register char  *s;
258   }
259  
260  
261 < void
262 < onsig(signo)                            /* fatal signal */
263 < int  signo;
261 > static void
262 > onsig(                          /* fatal signal */
263 >        int  signo
264 > )
265   {
266          static int  gotsig = 0;
267  
# Line 280 | Line 277 | int  signo;
277   }
278  
279  
280 < void
281 < sigdie(signo, msg)                      /* set fatal signal */
282 < int  signo;
283 < char  *msg;
280 > static void
281 > sigdie(                 /* set fatal signal */
282 >        int  signo,
283 >        char  *msg
284 > )
285   {
286          if (signal(signo, onsig) == SIG_IGN)
287                  signal(signo, SIG_IGN);
# Line 291 | Line 289 | char  *msg;
289   }
290  
291  
292 < void
293 < printdefaults()                 /* print default values to stdout */
292 > static void
293 > printdefaults(void)                     /* print default values to stdout */
294   {
297 –        register char  *cp;
298 –
295          printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" :
296                          "-b-\t\t\t\t# greyscale off\n");
297          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,

Diff Legend

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