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

Comparing ray/src/common/words.c (file contents):
Revision 2.10 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.11 by greg, Thu Apr 28 17:46:25 2011 UTC

# Line 17 | Line 17 | static const char RCSid[] = "$Id$";
17   char *
18   atos(char *rs, int nb, char *s)         /* get word from string, returning rs */
19   {
20 <        register char  *cp = rs;
20 >        char  *cp = rs;
21  
22          while (isspace(*s))
23                  s++;
# Line 83 | Line 83 | iskip(char *s)                 /* skip integer in string */
83   {
84          while (isspace(*s))
85                  s++;
86 <        if (*s == '-' || *s == '+')
86 >        if ((*s == '-') | (*s == '+'))
87                  s++;
88          if (!isdigit(*s))
89                  return(NULL);
# Line 97 | Line 97 | iskip(char *s)                 /* skip integer in string */
97   char *
98   fskip(char *s)                  /* skip float in string */
99   {
100 <        register char  *cp;
100 >        char  *cp;
101  
102          while (isspace(*s))
103                  s++;
104 <        if (*s == '-' || *s == '+')
104 >        if ((*s == '-') | (*s == '+'))
105                  s++;
106          cp = s;
107          while (isdigit(*cp))
# Line 113 | Line 113 | fskip(char *s)                 /* skip float in string */
113          }
114          if (cp == s)
115                  return(NULL);
116 <        if (*cp == 'e' || *cp == 'E')
117 <                return(iskip(cp+1));
116 >        if ((*cp == 'e') | (*cp == 'E'))
117 >                return(isspace(*++cp) ? NULL : iskip(cp));
118          return(cp);
119   }
120  
# Line 122 | Line 122 | fskip(char *s)                 /* skip float in string */
122   int
123   isint(char *s)                  /* check integer format */
124   {
125 <        register char  *cp;
125 >        char  *cp;
126  
127          cp = iskip(s);
128          return(cp != NULL && *cp == '\0');
# Line 132 | Line 132 | isint(char *s)                 /* check integer format */
132   int
133   isintd(char *s, char *ds)       /* check integer format with delimiter set */
134   {
135 <        register char  *cp;
135 >        char  *cp;
136  
137          cp = iskip(s);
138          return(cp != NULL && strchr(ds, *cp) != NULL);
# Line 142 | Line 142 | isintd(char *s, char *ds)      /* check integer format with
142   int
143   isflt(char *s)                  /* check float format */
144   {
145 <        register char  *cp;
145 >        char  *cp;
146  
147          cp = fskip(s);
148          return(cp != NULL && *cp == '\0');
# Line 152 | Line 152 | isflt(char *s)                 /* check float format */
152   int
153   isfltd(char *s, char *ds)       /* check integer format with delimiter set */
154   {
155 <        register char  *cp;
155 >        char  *cp;
156  
157          cp = fskip(s);
158          return(cp != NULL && strchr(ds, *cp) != NULL);

Diff Legend

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