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

Comparing ray/src/ot/readobj2.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:26 2003 UTC vs.
Revision 2.9 by schorsch, Sat Mar 27 12:41:45 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  readobj2.c - routines for reading in object descriptions.
6   */
7  
8 < #include  "standard.h"
8 > #include  <ctype.h>
9 > #include  <stdio.h>
10  
11 + #include  "platform.h"
12 + #include  "rtprocess.h"
13 + #include  "rtmath.h"
14 + #include  "rtio.h"
15 + #include  "rterror.h"
16   #include  "object.h"
11 –
17   #include  "otypes.h"
18 + #include  "oconv.h"
19  
14 – #include  <ctype.h>
20  
21 < extern char  *fgetword();
21 > static void getobject2(char  *name, FILE  *fp, ro_cbfunc f);
22  
23 < readobj2(input, callback)       /* read in an object file or stream */
24 < char  *input;
25 < int  (*callback)();
23 >
24 > void
25 > readobj2(       /* read in an object file or stream */
26 >        char  *input,
27 >        ro_cbfunc callback
28 > )
29   {
22 –        FILE  *popen();
30          char  *fgetline();
31          FILE  *infp;
32          char  buf[512];
# Line 58 | Line 65 | int  (*callback)();
65   }
66  
67  
68 < getobject2(name, fp, f)                 /* read the next object */
69 < char  *name;
70 < FILE  *fp;
71 < int  (*f)();
68 > static void
69 > getobject2(                     /* read the next object */
70 >        char  *name,
71 >        FILE  *fp,
72 >        ro_cbfunc f
73 > )
74   {
75          char  sbuf[MAXSTR];
76          OBJREC  thisobj;
# Line 70 | Line 79 | int  (*f)();
79          thisobj.omod = OVOID;
80                                          /* get type */
81          fgetword(sbuf, MAXSTR, fp);
82 <        if (!strcmp(sbuf, ALIASID))
74 <                thisobj.otype = -1;
75 <        else if ((thisobj.otype = otype(sbuf)) < 0) {
82 >        if ((thisobj.otype = otype(sbuf)) < 0) {
83                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
84                  error(USER, errmsg);
85          }
# Line 80 | Line 87 | int  (*f)();
87          fgetword(sbuf, MAXSTR, fp);
88          thisobj.oname = sbuf;
89                                          /* get arguments */
90 <        if (thisobj.otype == -1) {
90 >        if (thisobj.otype == MOD_ALIAS) {
91                  fscanf(fp, "%*s");
92                  return;
93          }

Diff Legend

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