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

Comparing ray/src/meta/sort.c (file contents):
Revision 1.3 by schorsch, Tue Jun 10 14:26:03 2003 UTC vs.
Revision 1.5 by greg, Mon Jun 16 14:54:54 2003 UTC

# Line 83 | Line 83 | int  (*pcmp)()         /* compares pointers to pointers to pr
83   */
84  
85   void
86 < mergesort(      /* merge sorted files with list */
86 > pmergesort(     /* merge sorted files with list */
87  
88   FILE  *fi[],            /* array of input files */
89   int  nf,                /* number of input files */
# Line 105 | Line 105 | FILE  *ofp             /* output file */
105  
106      for (i = 0; i < nf; i++) {          /* initialize input files */
107          if ((pp[i] = palloc()) == NULL)
108 <            error(SYSTEM, "memory exhausted in mergesort");
108 >            error(SYSTEM, "memory exhausted in pmergesort");
109          readp(pp[i], fi[i]);
110      }
111  
# Line 167 | Line 167 | FILE  *ofp
167          if ((fp = ofp) == NULL)
168              fp = efopen(tfname(height + 1, nt), "w");
169          
170 <        mergesort(fi, nf, pl, pcmp, fp);
170 >        pmergesort(fi, nf, pl, pcmp, fp);
171          
172          for (i = 0; i < nf; i++) {
173              fclose(fi[i]);
# Line 286 | Line 286 | int  lvl, int num
286                  temp_directory(pathbuf, sizeof(pathbuf));
287                  psiz = strlen(pathbuf);
288          }
289 <        snprintf(fnbuf, sizeof(pathbuf, psiz),
289 >        snprintf(fnbuf, sizeof(pathbuf)-psiz,
290                          "%s/S%d%c%d", pathbuf, getpid(), lvl+'A', num);
291      /*sprintf(fnbuf, "%sS%d%c%d", TDIR, getpid(), lvl+'A', num);*/
292  

Diff Legend

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