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

Comparing ray/src/ot/readobj2.c (file contents):
Revision 1.4 by greg, Fri Jul 19 09:29:24 1991 UTC vs.
Revision 2.3 by greg, Fri Jun 4 17:02:19 1993 UTC

# Line 16 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
16  
17   #include  <ctype.h>
18  
19 + extern char  *fgetword();
20 +
21   OBJREC  *objblock[MAXOBJBLK];           /* our objects */
22   OBJECT  nobjects = 0;                   /* # of objects */
23   int newobject() {return(0);}
# Line 26 | Line 28 | char  *input;
28   int  (*callback)();
29   {
30          FILE  *popen();
31 <        char  *fgets(), *fgetline();
31 >        char  *fgetline();
32          FILE  *infp;
33          char  buf[512];
34          register int  c;
# Line 72 | Line 74 | int  (*f)();
74          char  sbuf[MAXSTR];
75          OBJREC  thisobj;
76                                          /* get modifier */
77 <        fscanf(fp, "%*s");
77 >        fgetword(sbuf, MAXSTR, fp);
78          thisobj.omod = OVOID;
79                                          /* get type */
80 <        fscanf(fp, "%s", sbuf);
80 >        fgetword(sbuf, MAXSTR, fp);
81          if (!strcmp(sbuf, ALIASID))
82                  thisobj.otype = -1;
83          else if ((thisobj.otype = otype(sbuf)) < 0) {
# Line 83 | Line 85 | int  (*f)();
85                  error(USER, errmsg);
86          }
87                                          /* get identifier */
88 <        fscanf(fp, "%s", sbuf);
88 >        fgetword(sbuf, MAXSTR, fp);
89          thisobj.oname = sbuf;
90                                          /* get arguments */
91          if (thisobj.otype == -1) {
# Line 95 | Line 97 | int  (*f)();
97                  objerror(&thisobj, USER, errmsg);
98          }
99          thisobj.os = NULL;
98 –        thisobj.lastrno = -1;
100                                          /* call function */
101          (*f)(&thisobj);
102                                          /* free memory */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)