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

Comparing ray/src/common/rexpr.c (file contents):
Revision 2.7 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.10 by greg, Sat Dec 28 18:05:14 2019 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9  
10   #include "copyright.h"
11  
12 #include <stdio.h>
12   #include <stdlib.h>
13   #include <ctype.h>
15 #include <string.h>
14  
15 + #include "rtio.h"
16 +
17   /*
18   * rexpr.c - regular expression parser (ala grep)
19   */
# Line 32 | Line 32 | static const char      RCSid[] = "$Id$";
32  
33   #define same(a,b) (a==b || (iflag && (a^b)==' ' && isalpha(a)))
34  
35 #ifdef  BSD
36 #define  memcpy(to,from,len)    bcopy(from,to,len)
37 #endif
35  
36 < static int     advance(), cclass();
36 > static int     advance(char *, char *);
37 > static int     cclass(char *, int c, int af);
38  
39   static char    expbuf[ESIZE];
40   static int     iflag;
# Line 49 | Line 47 | ecompile(sp, iflg, wflag)               /* compile the
47   register char  *sp;
48   int iflg, wflag;
49   {
50 <        register c;
50 >        register int c;
51          register char *ep;
52 <        char *lastep;
52 >        char *lastep = NULL;
53          int cclcnt;
54          
55          iflag = iflg;
# Line 167 | Line 165 | register char *sp;
165                  return(NULL);
166          /* fast check for first character */
167          if (expbuf[0]==CCHR) {
168 <                register c = expbuf[1];
168 >                register int c = expbuf[1];
169                  while (*++sp)
170                          if (same(*sp, c) && advance(sp, expbuf))
171                                  return(sp);
# Line 271 | Line 269 | register char *ep;
269   static int
270   cclass(set, c, af)
271   register char *set;
272 < register c;
272 > register int c;
273   int af;
274   {
275 <        register n;
275 >        register int n;
276  
277          if (c == 0)
278                  return(0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines