diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libio/fileops.c | 2 | ||||
| -rw-r--r-- | libio/oldfileops.c | 6 | ||||
| -rw-r--r-- | libio/wfileops.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 0e091b1f43..244dc80800 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-09-05 Siddhesh Poyarekar <siddhesh@redhat.com> + * libio/fileops.c: Fix typos in comments. + * libio/oldfileops.c: Likewise. + * libio/wfileops.c: Likewise. + +2012-09-05 Siddhesh Poyarekar <siddhesh@redhat.com> + [BZ #1349] * malloc/Makefile (tests): Add tst-malloc-usable test case. (tst-malloc-usable-ENV): Set environment for test case. diff --git a/libio/fileops.c b/libio/fileops.c index 7c7fef1c75..43973c535d 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -101,7 +101,7 @@ extern struct __gconv_trans_data __libio_translit attribute_hidden; to _IO_buf_base, though not necessarily if we have switched from get mode to put mode. (The reason is to maintain the invariant that _IO_read_end corresponds to the external file position.) - _IO_write_base is non-NULL and usually equal to _IO_base_base. + _IO_write_base is non-NULL and usually equal to _IO_buf_base. We also have _IO_write_end == _IO_buf_end, but only in fully buffered mode. The un-flushed character are those between _IO_write_base and _IO_write_ptr. diff --git a/libio/oldfileops.c b/libio/oldfileops.c index c68ca6a76f..8fda0484aa 100644 --- a/libio/oldfileops.c +++ b/libio/oldfileops.c @@ -76,7 +76,7 @@ extern int errno; to _IO_buf_base, though not necessarily if we have switched from get mode to put mode. (The reason is to maintain the invariant that _IO_read_end corresponds to the external file position.) - _IO_write_base is non-NULL and usually equal to _IO_base_base. + _IO_write_base is non-NULL and usually equal to _IO_buf_base. We also have _IO_write_end == _IO_buf_end, but only in fully buffered mode. The un-flushed character are those between _IO_write_base and _IO_write_ptr. @@ -492,10 +492,10 @@ _IO_old_file_seekoff (fp, offset, dir, mode) /* Flush unwritten characters. (This may do an unneeded write if we seek within the buffer. But to be able to switch to reading, we would need to set - egptr to ptr. That can't be done in the current design, + egptr to pptr. That can't be done in the current design, which assumes file_ptr() is eGptr. Anyway, since we probably end up flushing when we close(), it doesn't make much difference.) - FIXME: simulate mem-papped files. */ + FIXME: simulate mem-mapped files. */ if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp)) if (_IO_switch_to_get_mode (fp)) diff --git a/libio/wfileops.c b/libio/wfileops.c index 3f628bfd1b..b790029ffc 100644 --- a/libio/wfileops.c +++ b/libio/wfileops.c @@ -589,7 +589,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode) /* Flush unwritten characters. (This may do an unneeded write if we seek within the buffer. But to be able to switch to reading, we would need to set - egptr to ptr. That can't be done in the current design, + egptr to pptr. That can't be done in the current design, which assumes file_ptr() is eGptr. Anyway, since we probably end up flushing when we close(), it doesn't make much difference.) FIXME: simulate mem-mapped files. */ |