diff options
author | Zack Weinberg <zackw@panix.com> | 2018-02-07 19:41:01 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:22:50 -0500 |
commit | df6c012b99499d95ed7fee53553a9f4d4473ccae (patch) | |
tree | 09c971734b9a5d34ae9116966e828273ceaf83d7 /libio/iofgets.c | |
parent | Remove legacy configuration knobs from libio. (diff) | |
download | glibc-df6c012b99499d95ed7fee53553a9f4d4473ccae.tar.gz glibc-df6c012b99499d95ed7fee53553a9f4d4473ccae.tar.bz2 glibc-df6c012b99499d95ed7fee53553a9f4d4473ccae.zip |
Remove _IO_file_flags define.
This entirely mechanical (except for some indentation fixups) patch
replaces all uses of _IO_file_flags with _flags and removes the #define.
Installed stripped libraries and executables are unchanged by this patch.
* libio/libio.h (_IO_file_flags): Remove macro.
All uses changed to _flags.
Diffstat (limited to 'libio/iofgets.c')
-rw-r--r-- | libio/iofgets.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libio/iofgets.c b/libio/iofgets.c index b15b59d3bf..68177dbe22 100644 --- a/libio/iofgets.c +++ b/libio/iofgets.c @@ -48,20 +48,19 @@ _IO_fgets (char *buf, int n, FILE *fp) /* This is very tricky since a file descriptor may be in the non-blocking mode. The error flag doesn't mean much in this case. We return an error only when there is a new error. */ - old_error = fp->_IO_file_flags & _IO_ERR_SEEN; - fp->_IO_file_flags &= ~_IO_ERR_SEEN; + old_error = fp->_flags & _IO_ERR_SEEN; + fp->_flags &= ~_IO_ERR_SEEN; count = _IO_getline (fp, buf, n - 1, '\n', 1); /* If we read in some bytes and errno is EAGAIN, that error will be reported for next read. */ - if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN) - && errno != EAGAIN)) + if (count == 0 || ((fp->_flags & _IO_ERR_SEEN) && errno != EAGAIN)) result = NULL; else { buf[count] = '\0'; result = buf; } - fp->_IO_file_flags |= old_error; + fp->_flags |= old_error; _IO_release_lock (fp); return result; } |