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.53 by greg, Tue May 13 17:58:33 2003 UTC vs.
Revision 3.54 by greg, Thu May 29 16:26:22 2003 UTC

# Line 45 | Line 45 | time_t starttime;              /* time we got started */
45   time_t  endtime;                /* time we should end by */
46   time_t  reporttime;             /* time for next report */
47  
48 < long    maxdisk;                /* maximum file space (bytes) */
48 > off_t   maxdisk;                /* maximum file space (bytes) */
49  
50   int     rtargc = 1;             /* rtrace command */
51   char    *rtargv[128] = {"rtrace", NULL};
# Line 214 | Line 214 | initrholo()                    /* get our holodeck running */
214                  init_global();
215                                                  /* record disk space limit */
216          if (!vdef(DISKSPACE))
217 <                maxdisk = (1L<<(sizeof(long)*8-2)) - 1024;
217 >                maxdisk = (1L<<(sizeof(off_t)*8-2)) - 1024;
218          else
219                  maxdisk = 1024.*1024.*vflt(DISKSPACE);
220                                                  /* set up memory cache */
# Line 287 | Line 287 | rholo()                                /* holodeck main loop */
287          static long     nextfragwarn = 100*(1L<<20);
288          static int      idle = 0;
289          PACKET  *pl = NULL, *plend;
290 <        long    fsiz;
290 >        off_t   fsiz;
291          int     pksiz;
292          register PACKET *p;
293          time_t  t;
# Line 475 | Line 475 | char   *s;
475  
476   loadholo()                      /* start loading a holodeck from fname */
477   {
478 –        extern long     ftell();
478          FILE    *fp;
479          int     fd;
480          int     n;
# Line 608 | Line 607 | int    ec;
607                  if (nprocs > 0)
608                          status = done_rtrace();         /* calls hdsync() */
609                  if (ncprocs > 0 & force >= 0 && vdef(REPORT)) {
610 <                        long    fsiz, fuse;
610 >                        off_t   fsiz, fuse;
611                          fsiz = hdfilen(hdlist[0]->fd);
612                          fuse = hdfiluse(hdlist[0]->fd, 1);
613                          fprintf(stderr,

Diff Legend

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