From 2e4250225cf894e11c926007698cea8096a372fb Mon Sep 17 00:00:00 2001 From: Feng Gao Date: Wed, 8 Jul 2015 13:40:50 +0530 Subject: Use "|" instead of "+" when combine the _IO_LINE_BUF and _IO_UNBUFFERED flags Both of "_IO_UNBUFFERED" and "_IO_LINE_BUF" are the bit flags, but I find there are some codes looks like "_IO_LINE_BUF+_IO_UNBUFFERED", while some codes are "_IO_LINE_BUF|_IO_UNBUFFERED". I think the former is not good, even though the final result is same. --- libio/oldfileops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libio/oldfileops.c') 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; } -- cgit v1.2.3