diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libio/fileops.c | 4 | ||||
| -rw-r--r-- | libio/oldfileops.c | 4 | ||||
| -rw-r--r-- | libio/wfileops.c | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 3a5cfeee40..07dc77306d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-07-08 Feng Gao <gfree.wind@gmail.com> + + * libio/fileops.c: Use "|" instead of "+" when combine _IO_LINE_BUF + and _IO_UNBUFFERED. + * libio/oldfileops.c: Likewise. + * libio/wfileops.c: Likewise. + 2015-07-08 Mike Frysinger <vapier@gentoo.org> * nscd/selinux.c: Delete selinux/flask.h include. diff --git a/libio/fileops.c b/libio/fileops.c index 966802443c..cbcd6f5353 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -521,7 +521,7 @@ new_do_write (_IO_FILE *fp, const char *data, _IO_size_t to_do) _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base); fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base; fp->_IO_write_end = (fp->_mode <= 0 - && (fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + && (fp->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) ? fp->_IO_buf_base : fp->_IO_buf_end); return count; } @@ -844,7 +844,7 @@ _IO_new_file_overflow (_IO_FILE *f, int ch) f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end; f->_flags |= _IO_CURRENTLY_PUTTING; - if (f->_mode <= 0 && f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + if (f->_mode <= 0 && f->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) f->_IO_write_end = f->_IO_write_ptr; } if (ch == EOF) diff --git a/libio/oldfileops.c b/libio/oldfileops.c index 84939e39ff..54789b2349 100644 --- a/libio/oldfileops.c +++ b/libio/oldfileops.c @@ -313,7 +313,7 @@ old_do_write (fp, data, to_do) fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, count) + 1; _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base); fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base; - fp->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + fp->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) ? fp->_IO_buf_base : fp->_IO_buf_end); return count; } @@ -418,7 +418,7 @@ _IO_old_file_overflow (f, ch) f->_IO_write_end = f->_IO_buf_end; f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end; - if (f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + if (f->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) f->_IO_write_end = f->_IO_write_ptr; f->_flags |= _IO_CURRENTLY_PUTTING; } diff --git a/libio/wfileops.c b/libio/wfileops.c index 73d7709867..99f9c8fe65 100644 --- a/libio/wfileops.c +++ b/libio/wfileops.c @@ -118,7 +118,7 @@ _IO_wdo_write (_IO_FILE *fp, const wchar_t *data, _IO_size_t to_do) fp->_wide_data->_IO_buf_base); fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_buf_base; - fp->_wide_data->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + fp->_wide_data->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) ? fp->_wide_data->_IO_buf_base : fp->_wide_data->_IO_buf_end); @@ -216,7 +216,7 @@ _IO_wfile_underflow (_IO_FILE *fp) /* Flush all line buffered files before reading. */ /* FIXME This can/should be moved to genops ?? */ - if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED)) + if (fp->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) { #if 0 _IO_flush_all_linebuffered (); @@ -477,7 +477,7 @@ _IO_wfile_overflow (_IO_FILE *f, wint_t wch) f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end; f->_flags |= _IO_CURRENTLY_PUTTING; - if (f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + if (f->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED)) f->_wide_data->_IO_write_end = f->_wide_data->_IO_write_ptr; } if (wch == WEOF) |