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

Comparing ray/src/common/header.c (file contents):
Revision 2.18 by greg, Sat Jul 12 15:14:44 2003 UTC vs.
Revision 2.21 by schorsch, Wed Jul 30 10:11:06 2003 UTC

# Line 187 | Line 187 | FILE  *fp;
187   int
188   getheader(fp, f, p)             /* get header from file */
189   FILE  *fp;
190 < int  (*f)();
190 > int  (*f)(char *, char *);
191   char  *p;
192   {
193          char  buf[MAXLINE];
# Line 311 | Line 311 | FILE  *fout;
311          if (!cdat.fs[0])
312                  return(0);
313          for (cp = fmt; *cp; cp++)               /* check for globbing */
314 <                if (*cp == '?' | *cp == '*')
314 >                if ((*cp == '?') | (*cp == '*')) {
315                          if (globmatch(fmt, cdat.fs)) {
316                                  strcpy(fmt, cdat.fs);
317                                  return(1);
318                          } else
319                                  return(-1);
320 +                }
321          return(strcmp(fmt, cdat.fs) ? -1 : 1);  /* literal match */
322   }

Diff Legend

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