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

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.40 by greg, Wed Mar 16 17:36:45 2022 UTC vs.
Revision 2.41 by greg, Wed Mar 16 18:01:47 2022 UTC

# Line 19 | Line 19 | static const char RCSid[] = "$Id$";
19    #include <sys/mman.h>
20   #endif
21  
22 – static char     delims[] = " \t\n\r\f";
23 –
22   #define MAXLEVELS       16      /* max RxC.. block pairs */
23  
24   typedef struct {
# Line 235 | Line 233 | count_columns(const RECINDEX *rp)
233   static int
234   print_record(const RECINDEX *rp, ssize_t n)
235   {
236 <        int     words2go = rp->nw_rec;
237 <        char    *scp;
236 >        static char     delims[] = " \t\n\r\f";
237 >        int             words2go = rp->nw_rec;
238 >        char            *scp;
239  
240          if ((n < 0) | (n >= rp->nrecs))
241                  return(0);
# Line 502 | Line 501 | badspec:
501          return(0);
502   }
503  
504 < /* resize ASCII stream input by ignoring EOLs between records */
504 > /* resize stream input by ignoring EOLs between ASCII records */
505   static int
506   do_resize(FILE *fp)
507   {
# Line 543 | Line 542 | do_resize(FILE *fp)
542                                          break;
543                                  goto done;      /* normal EOD */
544                          }
545 <                        if (check && !isfltd(word, delims)) {
545 >                        if (check && !isflt(word)) {
546                                  fputs("Badly formed number: ", stderr);
547                                  fputs(word, stderr);
548                                  fputc('\n', stderr);

Diff Legend

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