GNU C Library master sources branch master updated. glibc-2.16-ports-merge-286-g1ffb8c9

[siddhesh at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  1ffb8c9001398e1c6402e455b566dfe3d84a0786 (commit)
      from  b9dafc562ec524c01f43907b1d213d5824261774 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1ffb8c9001398e1c6402e455b566dfe3d84a0786

commit 1ffb8c9001398e1c6402e455b566dfe3d84a0786
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Wed Sep 5 22:04:10 2012 +0530

    Fix typos in comments
    
            * libio/fileops.c: Fix typos in comments.
            * libio/oldfileops.c: Likewise.
            * libio/wfileops.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0e091b1..244dc80 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 7c7fef1..43973c5 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 c68ca6a..8fda048 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 3f628bf..b790029 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. */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    6 ++++++
 libio/fileops.c    |    2 +-
 libio/oldfileops.c |    6 +++---
 libio/wfileops.c   |    2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources