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

Comparing src/common/fgetval.c (file contents):
Revision 2.1 by greg, Fri Jun 30 16:06:09 1995 UTC vs.
Revision 2.3 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1995 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Read white space separated values from stream
6 + *
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 + */
66 +
67   #include  <stdio.h>
68  
69   #include  <math.h>
70  
71 < #include  <ctype.h>
71 > #include  <stdlib.h>
72  
73 + #include  <string.h>
74  
75 < #ifdef DCL_ATOF
19 < extern double   atof();
20 < #endif
21 < extern int      atoi();
22 < extern long     atol();
23 < extern char     *strcpy();
75 > #include  <ctype.h>
76  
77  
78 +
79   int
80   fgetval(fp, ty, vp)                     /* get specified data word */
81   register FILE   *fp;
82   int     ty;
83   char    *vp;
84   {
32 –        static char     delims[] = " \t\n\r\f#";
85          char    wrd[64];
86          register char   *cp;
87          register int    c;
# Line 55 | Line 107 | char   *vp;
107          *cp = '\0';
108          switch (ty) {                   /* check and convert it */
109          case 'h':                       /* short */
110 <                if (!isintd(wrd, delims))
110 >                if (!isint(wrd))
111                          return(0);
112                  *(short *)vp = c = atoi(wrd);
113                  if (*(short *)vp != c)
114                          return(0);
115                  return(1);
116          case 'i':                       /* integer */
117 <                if (!isintd(wrd, delims))
117 >                if (!isint(wrd))
118                          return(0);
119                  *(int *)vp = atoi(wrd);
120                  return(1);
121          case 'l':                       /* long */
122 <                if (!isintd(wrd, delims))
122 >                if (!isint(wrd))
123                          return(0);
124                  *(long *)vp = atol(wrd);
125                  return(1);
126          case 'f':                       /* float */
127 <                if (!isfltd(wrd, delims))
127 >                if (!isflt(wrd))
128                          return(0);
129                  *(float *)vp = atof(wrd);
130                  return(1);
131          case 'd':                       /* double */
132 <                if (!isfltd(wrd, delims))
132 >                if (!isflt(wrd))
133                          return(0);
134                  *(double *)vp = atof(wrd);
135                  return(1);

Diff Legend

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