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.4 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.9 by schorsch, Thu Jul 17 09:21:29 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   * External symbols declared in standard.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include <stdio.h>
13   #include <stdlib.h>
14   #include <ctype.h>
15 + #include <string.h>
16 +
17 + #include "rtio.h"
18 +
19   /*
20   * rexpr.c - regular expression parser (ala grep)
21   */
# Line 85 | Line 34 | static const char      RCSid[] = "$Id$";
34  
35   #define same(a,b) (a==b || (iflag && (a^b)==' ' && isalpha(a)))
36  
88 – #ifdef  BSD
89 – #define  memcpy(to,from,len)    bcopy(from,to,len)
90 – #endif
37  
38 < static int     advance(), cclass();
38 > static int     advance(char *, char *);
39 > static int     cclass(char *, int c, int af);
40  
41   static char    expbuf[ESIZE];
42   static int     iflag;
# Line 102 | Line 49 | ecompile(sp, iflg, wflag)               /* compile the
49   register char  *sp;
50   int iflg, wflag;
51   {
52 <        register c;
52 >        register int c;
53          register char *ep;
54 <        char *lastep;
54 >        char *lastep = NULL;
55          int cclcnt;
56          
57          iflag = iflg;
# Line 220 | Line 167 | register char *sp;
167                  return(NULL);
168          /* fast check for first character */
169          if (expbuf[0]==CCHR) {
170 <                register c = expbuf[1];
170 >                register int c = expbuf[1];
171                  while (*++sp)
172                          if (same(*sp, c) && advance(sp, expbuf))
173                                  return(sp);
# Line 324 | Line 271 | register char *ep;
271   static int
272   cclass(set, c, af)
273   register char *set;
274 < register c;
274 > register int c;
275   int af;
276   {
277 <        register n;
277 >        register int n;
278  
279          if (c == 0)
280                  return(0);

Diff Legend

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