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

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.38 by gwlarson, Wed Jan 28 12:32:50 1998 UTC vs.
Revision 3.40 by gwlarson, Wed Jun 3 12:18:24 1998 UTC

# Line 26 | Line 26 | char   *progname;              /* our program name */
26   char    *hdkfile;               /* holodeck file name */
27   char    froot[256];             /* root file name */
28  
29 – int     nowarn = 0;             /* turn warnings off? */
30 –
29   int     ncprocs = 0;            /* desired number of compute processes */
30  
31   char    *outdev = NULL;         /* output device name */
# Line 55 | Line 53 | int    totqlen;                /* maximum queue length when full */
53  
54   char  *sigerr[NSIG];            /* signal error messages */
55  
56 + extern int      nowarn;         /* turn warnings off? */
57 +
58   extern time_t   time();
59  
60  
# Line 453 | Line 453 | loadholo()                     /* start loading a holodeck from fname */
453          int4    nextloc;
454                                          /* open holodeck file */
455          if ((fp = fopen(hdkfile, ncprocs>0 ? "r+" : "r")) == NULL) {
456 <                sprintf(errmsg, "cannot open \"%s\" for %s", hdkfile,
457 <                                ncprocs>0 ? "appending" : "reading");
456 >                sprintf(errmsg, "cannot %s \"%s\"",
457 >                                ncprocs>0 ? "append" : "read", hdkfile);
458                  error(SYSTEM, errmsg);
459          }
460                                          /* load variables from header */
# Line 550 | Line 550 | register char  *s;
550                  fflush(stderr);
551                  midline = 0;
552          }
553 – }
554 –
555 –
556 – wputs(s)                        /* put warning string to stderr */
557 – char    *s;
558 – {
559 –        if (!nowarn)
560 –                eputs(s);
553   }
554  
555  

Diff Legend

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