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

Comparing src/hd/rhoptimize.c (file contents):
Revision 3.20 by greg, Thu Sep 30 15:43:30 2010 UTC vs.
Revision 3.23 by greg, Mon Oct 21 18:19:32 2019 UTC

# Line 98 | Line 98 | main(
98                                  outname, inpname);
99                  error(SYSTEM, errmsg);
100          }
101 <        return 0;
101 >        return(0);
102   }
103  
104  
# Line 112 | Line 112 | rhinitcopy(    /* open files and copy header */
112          FILE    *infp, *outfp;
113          long    ifpos;
114                                          /* open files for i/o */
115 <        if ((infp = fopen(infn, "r")) == NULL) {
115 >        if ((infp = fopen(infn, "rb")) == NULL) {
116                  sprintf(errmsg, "cannot open \"%s\" for reading", infn);
117                  error(SYSTEM, errmsg);
118          }
# Line 120 | Line 120 | rhinitcopy(    /* open files and copy header */
120                  sprintf(errmsg, "output file \"%s\" already exists!", outfn);
121                  error(USER, errmsg);
122          }
123 <        if ((outfp = fopen(outfn, "w+")) == NULL) {
123 >        if ((outfp = fopen(outfn, "wb+")) == NULL) {
124                  sprintf(errmsg, "cannot open \"%s\" for writing", outfn);
125                  error(SYSTEM, errmsg);
126          }
127                                          /* set up signal handling */
128 + #ifdef SIGINT
129          if (signal(SIGINT, quit) == SIG_IGN) signal(SIGINT, SIG_IGN);
130 + #endif
131 + #ifdef SIGHUP
132          if (signal(SIGHUP, quit) == SIG_IGN) signal(SIGHUP, SIG_IGN);
133 + #endif
134 + #ifdef SIGTERM
135          if (signal(SIGTERM, quit) == SIG_IGN) signal(SIGTERM, SIG_IGN);
136 + #endif
137   #ifdef SIGXCPU
138          if (signal(SIGXCPU, quit) == SIG_IGN) signal(SIGXCPU, SIG_IGN);
139          if (signal(SIGXFSZ, quit) == SIG_IGN) signal(SIGXFSZ, SIG_IGN);
# Line 156 | Line 162 | rhinitcopy(    /* open files and copy header */
162  
163   static int
164   nuniq(                  /* sort unique rays to front of beam list */
165 <        register RAYVAL *rva,
165 >        RAYVAL  *rva,
166          int     n
167   )
168   {
169 <        register int    i, j;
169 >        int     i, j;
170          RAYVAL  rtmp;
171  
172          for (j = 0; j < n; j++)
# Line 188 | Line 194 | bpcmp(                 /* compare beam positions on disk */
194          const void      *b2p
195   )
196   {
197 <        register off_t  pdif = beamdir[*(int*)b1p].fo - beamdir[*(int*)b2p].fo;
197 >        off_t   pdif = beamdir[*(int*)b1p].fo - beamdir[*(int*)b2p].fo;
198  
199          if (pdif < 0L) return(-1);
200          return(pdif > 0L);
# Line 203 | Line 209 | xferclump(             /* transfer the given clump to hout and fr
209          int     nb
210   )
211   {
212 <        register int    i;
213 <        register BEAM   *bp;
212 >        int     i;
213 >        BEAM    *bp;
214          int     n;
215  
216          beamdir = hp->bi;               /* sort based on file position */
# Line 243 | Line 249 | copysect(              /* copy holodeck section from ifd to ofd */
249  
250   void
251   eputs(s)                        /* put error message to stderr */
252 < register char  *s;
252 > char  *s;
253   {
254          static int  midline = 0;
255  

Diff Legend

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