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

Comparing src/common/header.c (file contents):
Revision 2.21 by schorsch, Wed Jul 30 10:11:06 2003 UTC vs.
Revision 2.24 by greg, Thu Mar 12 18:37:24 2009 UTC

# Line 26 | Line 26 | static const char      RCSid[] = "$Id$";
26  
27   #include "copyright.h"
28  
29 – #include  <time.h>
29   #include  <ctype.h>
30  
31   #include  "rtio.h"
32   #include  "resolu.h"
33  
34 < #define  MAXLINE        512
34 > #define  MAXLINE        2048
35  
36   char  HDRSTR[] = "#?";          /* information header magic number */
37  
# Line 40 | Line 39 | char  FMTSTR[] = "FORMAT=";    /* format identifier */
39  
40   char  TMSTR[] = "CAPDATE=";     /* capture date identifier */
41  
42 < static int mycheck();
42 > static gethfunc mycheck;
43  
44  
45 < void
46 < newheader(s, fp)                /* identifying line of information header */
47 < char  *s;
48 < register FILE  *fp;
45 > extern void
46 > newheader(              /* identifying line of information header */
47 >        char  *s,
48 >        register FILE  *fp
49 > )
50   {
51          fputs(HDRSTR, fp);
52          fputs(s, fp);
# Line 54 | Line 54 | register FILE  *fp;
54   }
55  
56  
57 < int
58 < headidval(r,s)                  /* get header id (return true if is id) */
59 < register char  *r, *s;
57 > extern int
58 > headidval(                      /* get header id (return true if is id) */
59 >        register char  *r,
60 >        register char   *s
61 > )
62   {
63          register char  *cp = HDRSTR;
64  
# Line 68 | Line 70 | register char  *r, *s;
70   }
71  
72  
73 < int
74 < isheadid(s)                     /* check to see if line is header id */
75 < char  *s;
73 > extern int
74 > isheadid(                       /* check to see if line is header id */
75 >        char  *s
76 > )
77   {
78          return(headidval(NULL, s));
79   }
80  
81  
82 < int
83 < dateval(tloc, s)                /* get capture date value */
84 < time_t  *tloc;
85 < char    *s;
82 > extern int
83 > dateval(                /* get capture date value */
84 >        time_t  *tloc,
85 >        char    *s
86 > )
87   {
88          struct tm       tms;
89          register char  *cp = TMSTR;
# Line 101 | Line 105 | char   *s;
105   }
106  
107  
108 < int
109 < isdate(s)                       /* is the given line a capture date? */
110 < char *s;
108 > extern int
109 > isdate(                 /* is the given line a capture date? */
110 >        char *s
111 > )
112   {
113          return(dateval(NULL, s));
114   }
115  
116  
117 < void
118 < fputdate(tv, fp)                /* write out the given time value */
119 < time_t  tv;
120 < FILE    *fp;
117 > extern void
118 > fputdate(               /* write out the given time value */
119 >        time_t  tv,
120 >        FILE    *fp
121 > )
122   {
123          struct tm       *tm = localtime(&tv);
124          if (tm == NULL)
# Line 123 | Line 129 | FILE   *fp;
129   }
130  
131  
132 < void
133 < fputnow(fp)                     /* write out the current time */
134 < FILE    *fp;
132 > extern void
133 > fputnow(                        /* write out the current time */
134 >        FILE    *fp
135 > )
136   {
137          time_t  tv;
138          time(&tv);
# Line 133 | Line 140 | FILE   *fp;
140   }
141  
142  
143 < void
144 < printargs(ac, av, fp)           /* print arguments to a file */
145 < int  ac;
146 < char  **av;
147 < FILE  *fp;
143 > extern void
144 > printargs(              /* print arguments to a file */
145 >        int  ac,
146 >        char  **av,
147 >        FILE  *fp
148 > )
149   {
150          while (ac-- > 0) {
151                  fputword(*av++, fp);
# Line 146 | Line 154 | FILE  *fp;
154   }
155  
156  
157 < int
158 < formatval(r, s)                 /* get format value (return true if format) */
159 < register char  *r;
160 < register char  *s;
157 > extern int
158 > formatval(                      /* get format value (return true if format) */
159 >        register char  *r,
160 >        register char  *s
161 > )
162   {
163          register char  *cp = FMTSTR;
164  
# Line 165 | Line 174 | register char  *s;
174   }
175  
176  
177 < int
178 < isformat(s)                     /* is line a format line? */
179 < char  *s;
177 > extern int
178 > isformat(                       /* is line a format line? */
179 >        char  *s
180 > )
181   {
182          return(formatval(NULL, s));
183   }
184  
185  
186 < void
187 < fputformat(s, fp)               /* put out a format value */
188 < char  *s;
189 < FILE  *fp;
186 > extern void
187 > fputformat(             /* put out a format value */
188 >        char  *s,
189 >        FILE  *fp
190 > )
191   {
192          fputs(FMTSTR, fp);
193          fputs(s, fp);
# Line 184 | Line 195 | FILE  *fp;
195   }
196  
197  
198 < int
199 < getheader(fp, f, p)             /* get header from file */
200 < FILE  *fp;
201 < int  (*f)(char *, char *);
202 < char  *p;
198 > extern int
199 > getheader(              /* get header from file */
200 >        FILE  *fp,
201 >        gethfunc *f,
202 >        void  *p
203 > )
204   {
205          char  buf[MAXLINE];
206  
# Line 219 | Line 231 | struct check {
231  
232  
233   static int
234 < mycheck(s, cp)                  /* check a header line for format info. */
235 < char  *s;
236 < register struct check  *cp;
234 > mycheck(                        /* check a header line for format info. */
235 >        char  *s,
236 >        void  *cp
237 > )
238   {
239 <        if (!formatval(cp->fs, s) && cp->fp != NULL)
240 <                fputs(s, cp->fp);
239 >        if (!formatval(((struct check*)cp)->fs, s)
240 >                        && ((struct check*)cp)->fp != NULL) {
241 >                fputs(s, ((struct check*)cp)->fp);
242 >        }
243          return(0);
244   }
245  
246  
247 < int
248 < globmatch(p, s)                 /* check for match of s against pattern p */
249 < register char   *p, *s;
247 > extern int
248 > globmatch(                      /* check for match of s against pattern p */
249 >        register char   *p,
250 >        register char   *s
251 > )
252   {
253          int     setmatch;
254  
# Line 295 | Line 312 | register char  *p, *s;
312   * if fout is not NULL.
313   */
314  
315 < int
316 < checkheader(fin, fmt, fout)
317 < FILE  *fin;
318 < char  *fmt;
319 < FILE  *fout;
315 > extern int
316 > checkheader(
317 >        FILE  *fin,
318 >        char  *fmt,
319 >        FILE  *fout
320 > )
321   {
322          struct check    cdat;
323          register char   *cp;
324  
325          cdat.fp = fout;
326          cdat.fs[0] = '\0';
327 <        if (getheader(fin, mycheck, (char *)&cdat) < 0)
327 >        if (getheader(fin, mycheck, &cdat) < 0)
328                  return(-1);
329          if (!cdat.fs[0])
330                  return(0);

Diff Legend

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