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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.33 by greg, Thu Jun 8 17:39:13 2023 UTC vs.
Revision 2.36 by greg, Wed Apr 23 01:57:04 2025 UTC

# Line 127 | Line 127 | readoct(                               /* read in octree file or stream */
127              }
128          }
129                                  /* close the input */
130 <        if (infn[0] == '!')
131 <                pclose(infp);
132 <        else if (infp != stdin)
130 >        if (inpspec[0] == '!') {
131 >                if (pclose(infp) != 0) {
132 >                        sprintf(errmsg, "bad status from \"%s\"", inpspec);
133 >                        error(WARNING, errmsg);
134 >                }
135 >        } else if (infp != stdin)
136                  fclose(infp);
137   #ifdef getc_unlocked
138          else
# Line 142 | Line 145 | readoct(                               /* read in octree file or stream */
145   static char *
146   ogetstr(char *s)                /* get null-terminated string */
147   {
145 –        extern char  *getstr();
146 –
148          if (getstr(s, infp) == NULL)
149                  octerror(USER, "truncated octree");
150          return(s);
# Line 154 | Line 155 | static OCTREE
155   getfullnode()                   /* get a set, return fullnode */
156   {
157          OBJECT  set[MAXSET+1];
158 <        register int  i;
159 <        register long  m;
158 >        int  i;
159 >        long  m;
160  
161          if ((set[0] = ogetint(objsize)) > MAXSET)
162                  octerror(USER, "bad set in getfullnode");
# Line 171 | Line 172 | getfullnode()                  /* get a set, return fullnode */
172   static long
173   ogetint(int siz)                /* get a siz-byte integer */
174   {
175 <        extern long  getint();
175 <        register long  r;
175 >        long  r;
176  
177          r = getint(siz, infp);
178          if (feof(infp))
# Line 184 | Line 184 | ogetint(int siz)               /* get a siz-byte integer */
184   static double
185   ogetflt()                       /* get a floating point number */
186   {
187 –        extern double  getflt();
187          double  r;
188  
189          r = getflt(infp);
# Line 197 | Line 196 | ogetflt()                      /* get a floating point number */
196   static OCTREE
197   gettree()                       /* get a pre-ordered octree */
198   {
199 <        register OCTREE  ot;
200 <        register int  i;
199 >        OCTREE   ot;
200 >        int  i;
201          
202          switch (getc(infp)) {
203          case OT_EMPTY:
# Line 224 | Line 223 | static int
223   nonsurfintree(OCTREE ot)                /* check tree for modifiers */
224   {
225          OBJECT  set[MAXSET+1];
226 <        register int  i;
226 >        int  i;
227  
228          if (isempty(ot))
229                  return(0);
# Line 245 | Line 244 | nonsurfintree(OCTREE ot)               /* check tree for modifiers
244   static void
245   skiptree(void)                          /* skip octree on input */
246   {
247 <        register int  i;
247 >        int  i;
248          
249          switch (getc(infp)) {
250          case OT_EMPTY:

Diff Legend

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