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

Comparing src/common/fgetline.c (file contents):
Revision 2.5 by greg, Wed Feb 11 22:11:33 2004 UTC vs.
Revision 2.8 by greg, Wed Jul 9 22:46:51 2014 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11  
12   #include  "rtio.h"
13  
14 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
15 + #undef getc
16 + #define getc    getc_unlocked
17 + #endif
18  
19 +
20   char *
21 < fgetline(s, n, fp)      /* read in line with escapes, elide final newline */
22 < char  *s;
23 < int  n;
24 < register FILE  *fp;
21 > fgetline(               /* read in line with escapes, elide final newline */
22 >        char  *s,
23 >        int  n,
24 >        FILE  *fp
25 > )
26   {
27 <        register char  *cp = s;
28 <        register int  c = EOF;
27 >        char  *cp = s;
28 >        int  c = EOF;
29  
30          while (--n > 0 && (c = getc(fp)) != EOF) {
31                  if (c == '\r' && (c = getc(fp)) != '\n') {
# Line 30 | Line 36 | register FILE  *fp;
36                          break;
37                  *cp++ = c;
38          }
39 <        if (cp == s && c == EOF)
39 >        if ((cp == s) & (c == EOF))
40                  return(NULL);
41          *cp = '\0';
42          return(s);

Diff Legend

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