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

Comparing ray/src/common/ezxml.c (file contents):
Revision 2.4 by greg, Sat Jun 11 01:04:08 2011 UTC vs.
Revision 2.5 by greg, Sat Feb 25 01:15:02 2012 UTC

# Line 170 | Line 170 | char *ezxml_decode(char *s, char **ent, char t)
170      char *e, *r = s, *m = s;
171      long b, c, d, l;
172  
173 <    for (; *s; s++) { /* normalize line endings */
174 <        while (*s == '\r') {
175 <            *(s++) = '\n';
176 <            if (*s == '\n') memmove(s, (s + 1), strlen(s));
177 <        }
178 <    }
173 >    for (; *s; s++)     /* normalize line endings */
174 >        if (*s == '\r') {
175 >            char *s2 = s+1;
176 >            do {
177 >                while (*s2 == '\r')
178 >                    ++s2;
179 >                *s++ = *s2;
180 >            } while (*s2++);
181 >            break;
182 >        }
183      
184      for (s = r; ; ) {
185          while (*s && *s != '&' && (*s != '%' || t != '%') && !isspace(*s)) s++;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines