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

Comparing ray/src/cv/trans.c (file contents):
Revision 2.4 by schorsch, Sun Jun 8 12:03:09 2003 UTC vs.
Revision 2.7 by greg, Sat Dec 28 18:05:14 2019 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *      Greg Ward
8   */
9  
10 – #include <stdio.h>
10   #include <stdlib.h>
12 – #include <string.h>
11  
12 < #include "standard.h"
12 > #include "rterror.h"
13 > #include "rtio.h"
14   #include "trans.h"
15  
16   static int idcmp(ID *id1, ID *id2);
17   static void fputidlist(IDLIST *qp, FILE *fp);
18   static int qtype(char *qnm, register QLIST *qlp);
19  
20 + extern int
21   fgetid(         /* read an id up to char in dls from fp */
22 < ID      *idp,
23 < char    *dls,
24 < register FILE   *fp
22 >        ID      *idp,
23 >        char    *dls,
24 >        register FILE   *fp
25   )
26   {
27          char    dset[256/8];
# Line 65 | Line 65 | register FILE  *fp
65   }
66  
67  
68 < int
68 > extern int
69   findid(         /* find (or insert) id in list */
70 < register IDLIST *idl,
71 < ID      *idp,
72 < int     insert
70 >        register IDLIST *idl,
71 >        ID      *idp,
72 >        int     insert
73   )
74   {
75          int  upper, lower;
# Line 118 | Line 118 | memerr:
118  
119   static int
120   idcmp(                          /* compare two identifiers */
121 < register ID     *id1,
122 < register ID *id2
121 >        register ID     *id1,
122 >        register ID *id2
123   )
124   {
125                                          /* names are greater than numbers */
# Line 136 | Line 136 | register ID *id2
136   }
137  
138  
139 < void
139 > extern void
140   write_quals(    /* write out qualifier lists */
141 < QLIST   *qlp,
142 < IDLIST  idl[],
143 < FILE    *fp
141 >        QLIST   *qlp,
142 >        IDLIST  idl[],
143 >        FILE    *fp
144   )
145   {
146          int     i;
# Line 156 | Line 156 | FILE   *fp
156  
157   static void
158   fputidlist(             /* put id list out to fp */
159 < IDLIST  *qp,
160 < FILE    *fp
159 >        IDLIST  *qp,
160 >        FILE    *fp
161   )
162   {
163          int     fi;
# Line 185 | Line 185 | FILE   *fp
185  
186   RULEHD *
187   getmapping(             /* read in mapping file */
188 < char    *file,
189 < QLIST   *qlp
188 >        char    *file,
189 >        QLIST   *qlp
190   )
191   {
192          char    *err;
# Line 285 | Line 285 | memerr:
285  
286   static int
287   qtype(                  /* return number for qualifier name */
288 < char    *qnm,
289 < register QLIST  *qlp
288 >        char    *qnm,
289 >        register QLIST  *qlp
290   )
291   {
292          register int    i;
# Line 298 | Line 298 | register QLIST *qlp
298   }
299  
300  
301 < int
301 > extern int
302   matchid(                        /* see if we match an id */
303 < register ID     *it,
304 < register IDMATCH        *im
303 >        register ID     *it,
304 >        register IDMATCH        *im
305   )
306   {
307          if (it->name == NULL) {

Diff Legend

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