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

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.54 by greg, Fri Jun 1 22:55:14 2012 UTC vs.
Revision 2.56 by greg, Thu Dec 5 03:02:56 2013 UTC

# Line 37 | Line 37 | main(
37   #ifndef NFS
38   #define  NFS                    1
39   #endif
40 <                                /* set the following to 0 to forgo forking */
40 >
41 > #ifndef RHAS_FORK_EXEC
42 > #undef MAXFORK
43 > #define MAXFORK                 0
44 > #endif
45   #ifndef MAXFORK
46   #if NFS
47   #define  MAXFORK                3       /* allotment of duped processes */
# Line 101 | Line 105 | main(
105          char  *argv[]
106   )
107   {
108 <        register int  i, rval;
108 >        int  i, rval;
109          
110          progname = argv[0];
111          for (i = 1; i < argc; i++) {
# Line 392 | Line 396 | nextpiece(             /* get next piece assignment */
396  
397   static int
398   rvrpiece(               /* check for recoverable pieces */
399 <        register int    *xp,
400 <        register int    *yp
399 >        int     *xp,
400 >        int     *yp
401   )
402   {
403          static char  *pdone = NULL;     /* which pieces are done */
404          static long  readpos = -1;      /* how far we've read */
405 <        register int  i;
405 >        int  px, py, i;
406          /*
407           * This routine is called by nextpiece() with an
408           * exclusive lock on syncfp and the file pointer at the
# Line 407 | Line 411 | rvrpiece(              /* check for recoverable pieces */
411          if (rvrlim < 0)
412                  return(0);              /* only check if asked */
413          if (pdone == NULL)              /* first call */
414 <                pdone = calloc(hmult*vmult, sizeof(char));
414 >                pdone = (char *)calloc(hmult*vmult, sizeof(char));
415          if (pdone == NULL) {
416                  fprintf(stderr, "%s: out of memory\n", progname);
417                  exit(1);
418          }
419          if (readpos != -1)              /* mark what's been done */
420                  fseek(syncfp, readpos, 0);
421 <        while (fscanf(syncfp, "%d %d", xp, yp) == 2)
422 <                pdone[*xp*vmult+*yp] = 1;
421 >        while (fscanf(syncfp, "%d %d", &px, &py) == 2)
422 >                pdone[px*vmult+py] = 1;
423          if (!feof(syncfp)) {
424                  fprintf(stderr, "%s: format error in sync file\n", progname);
425                  exit(1);
# Line 522 | Line 526 | int    ypos
526          struct flock  fls;
527          int  pid, status;
528          int  hr, vr;
529 <        register int  y;
529 >        int  y;
530                                  /* check bounds */
531          if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
532                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines