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

Comparing ray/src/common/header.c (file contents):
Revision 2.30 by greg, Sun May 7 16:14:19 2017 UTC vs.
Revision 2.33 by greg, Sat May 25 04:00:54 2019 UTC

# Line 45 | Line 45 | static gethfunc mycheck;
45  
46   void
47   newheader(              /* identifying line of information header */
48 <        char  *s,
48 >        const char  *s,
49          FILE  *fp
50   )
51   {
# Line 58 | Line 58 | newheader(             /* identifying line of information header
58   int
59   headidval(                      /* get header id (return true if is id) */
60          char  *r,
61 <        char    *s
61 >        const char      *s
62   )
63   {
64          const char  *cp = HDRSTR;
# Line 74 | Line 74 | headidval(                     /* get header id (return true if is id) *
74   int
75   dateval(                /* convert capture date line to UTC */
76          time_t  *tloc,
77 <        char    *s
77 >        const char      *s
78   )
79   {
80          struct tm       tms;
# Line 100 | Line 100 | dateval(               /* convert capture date line to UTC */
100   int
101   gmtval(                 /* convert GMT date line to UTC */
102          time_t  *tloc,
103 <        char    *s
103 >        const char      *s
104   )
105   {
106          struct tm       tms;
# Line 170 | Line 170 | printargs(             /* print arguments to a file */
170  
171   int
172   formatval(                      /* get format value (return true if format) */
173 <        char  *r,
174 <        char  *s
173 >        char  fmt[MAXFMTLEN],
174 >        const char  *s
175   )
176   {
177          const char  *cp = FMTSTR;
178 +        char  *r = fmt;
179  
180          while (*cp) if (*cp++ != *s++) return(0);
181          while (isspace(*s)) s++;
# Line 182 | Line 183 | formatval(                     /* get format value (return true if forma
183          if (r == NULL) return(1);
184          do
185                  *r++ = *s++;
186 <        while (*s && !isspace(*s));
186 >        while (*s && !isspace(*s) && r-fmt < MAXFMTLEN-1);
187          *r = '\0';
188          return(1);
189   }
# Line 190 | Line 191 | formatval(                     /* get format value (return true if forma
191  
192   void
193   fputformat(             /* put out a format value */
194 <        char  *s,
194 >        const char  *s,
195          FILE  *fp
196   )
197   {
# Line 230 | Line 231 | getheader(             /* get header from file */
231  
232   struct check {
233          FILE    *fp;
234 <        char    fs[64];
234 >        char    fs[MAXFMTLEN];
235   };
236  
237  
# Line 240 | Line 241 | mycheck(                       /* check a header line for format info. */
241          void  *cp
242   )
243   {
244 <        if (!formatval(((struct check*)cp)->fs, s)
245 <                        && ((struct check*)cp)->fp != NULL) {
246 <                fputs(s, ((struct check*)cp)->fp);
247 <        }
244 >        struct check    *scp = (struct check *)cp;
245 >
246 >        if (!formatval(scp->fs, s) && scp->fp != NULL)
247 >                fputs(s, scp->fp);
248 >
249          return(0);
250   }
251  
252  
253   int
254   globmatch(                      /* check for match of s against pattern p */
255 <        char    *p,
256 <        char    *s
255 >        const char      *p,
256 >        const char      *s
257   )
258   {
259          int     setmatch;
# Line 319 | Line 321 | globmatch(                     /* check for match of s against pattern p
321   int
322   checkheader(
323          FILE  *fin,
324 <        char  *fmt,
324 >        char  fmt[MAXFMTLEN],
325          FILE  *fout
326   )
327   {

Diff Legend

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