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

Diff Legend

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