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.3 by greg, Thu Nov 12 16:20:09 1992 UTC vs.
Revision 2.4 by greg, Sun Feb 27 10:16:45 1994 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1994 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 9 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9   *
10   *      8/19/88
11   *
12 + *  newheader(t,fp)     start new information header identified by string t
13 + *  isheadid(s)         returns true if s is a header id line
14 + *  headidval(r,s)      copy header identifier value in s to r
15   *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
16   *  isformat(s)         returns true if s is of the form "FORMAT=*"
17   *  formatval(r,s)      copy the format value in s to r
# Line 30 | Line 33 | static char SCCSid[] = "$SunId$ LBL";
33  
34   extern char  *index();
35  
36 < char  FMTSTR[] = "FORMAT=";
34 < int  FMTSTRL = 7;
36 > char  HDRSTR[] = "#?";          /* information header magic number */
37  
38 + char  FMTSTR[] = "FORMAT=";     /* format identifier */
39  
40 +
41 + newheader(s, fp)                /* identifying line of information header */
42 + char  *s;
43 + register FILE  *fp;
44 + {
45 +        fputs(HDRSTR, fp);
46 +        fputs(s, fp);
47 +        putc('\n', fp);
48 + }
49 +
50 +
51 + headidval(r,s)                  /* get header id (return true if is id) */
52 + register char  *r, *s;
53 + {
54 +        register char  *cp = HDRSTR;
55 +
56 +        while (*cp) if (*cp++ != *s++) return(0);
57 +        if (r == NULL) return(1);
58 +        while (*s) *r++ = *s++;
59 +        *r = '\0';
60 +        return(1);
61 + }
62 +
63 +
64 + isheadid(s)                     /* check to see if line is header id */
65 + char  *s;
66 + {
67 +        return(headidval(NULL, s));
68 + }
69 +
70 +
71   printargs(ac, av, fp)           /* print arguments to a file */
72   int  ac;
73   char  **av;
# Line 58 | Line 92 | register FILE  *fp;
92   }
93  
94  
95 < isformat(s)                     /* is line a format line? */
62 < char  *s;
63 < {
64 <        return(!strncmp(s,FMTSTR,FMTSTRL));
65 < }
66 <
67 <
68 < formatval(r, s)                 /* return format value */
95 > formatval(r, s)                 /* get format value (return true if format) */
96   register char  *r;
97   register char  *s;
98   {
99 <        s += FMTSTRL;
99 >        register char  *cp = FMTSTR;
100 >
101 >        while (*cp) if (*cp++ != *s++) return(0);
102          while (isspace(*s)) s++;
103 <        if (!*s) { *r = '\0'; return; }
103 >        if (!*s) return(0);
104 >        if (r == NULL) return(1);
105          while(*s) *r++ = *s++;
106          while (isspace(r[-1])) r--;
107          *r = '\0';
108 +        return(1);
109   }
110  
111  
112 + isformat(s)                     /* is line a format line? */
113 + char  *s;
114 + {
115 +        return(formatval(NULL, s));
116 + }
117 +
118 +
119   fputformat(s, fp)               /* put out a format value */
120   char  *s;
121   FILE  *fp;
# Line 126 | Line 164 | mycheck(s, cp)                 /* check a header line for format inf
164   char  *s;
165   register struct check  *cp;
166   {
167 <        if (!strncmp(s,FMTSTR,FMTSTRL))
130 <                formatval(cp->fs, s);
131 <        else if (cp->fp != NULL)        /* don't copy format info. */
167 >        if (!formatval(cp->fs, s) && cp->fp != NULL)
168                  fputs(s, cp->fp);
169   }
170  

Diff Legend

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