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.6 by greg, Tue Mar 20 18:45:04 2018 UTC

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

Diff Legend

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