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.8 by schorsch, Mon Oct 27 10:29:29 2003 UTC vs.
Revision 2.13 by greg, Tue Apr 22 04:45:25 2025 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9   #include  <stdio.h>
10  
11   #include  "platform.h"
12 < #include  "rtprocess.h"
12 > #include  "paths.h"
13   #include  "rtmath.h"
14   #include  "rtio.h"
15   #include  "rterror.h"
16   #include  "object.h"
17   #include  "otypes.h"
18 + #include  "oconv.h"
19  
20  
21 < static void getobject2(char  *name, FILE  *fp, int  (*f)());
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   {
26        char  *fgetline();
30          FILE  *infp;
31 <        char  buf[512];
31 >        char  buf[2048];
32          register int  c;
33  
34          if (input == NULL) {
# Line 54 | Line 57 | int  (*callback)();
57                          getobject2(input, infp, callback);
58                  }
59          }
60 <        if (input[0] == '!')
61 <                pclose(infp);
62 <        else
60 >        if (input[0] == '!') {
61 >                if (pclose(infp) != 0) {
62 >                        sprintf(errmsg, "bad status from \"%s\"", input);
63 >                        error(SYSTEM, errmsg);
64 >                }
65 >        } else
66                  fclose(infp);
67   }
68  
69  
70   static void
71   getobject2(                     /* read the next object */
72 < char  *name,
73 < FILE  *fp,
74 < int  (*f)()
72 >        char  *name,
73 >        FILE  *fp,
74 >        ro_cbfunc f
75   )
76   {
77          char  sbuf[MAXSTR];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines