about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libio/libio.h10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ccd2f78c5..c29f9a7fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-12  Roland McGrath  <roland@hack.frob.com>
+
+	[BZ #2074]
+	* libio/libio.h (__io_write_fn): Update comment.
+
 2012-04-12  Petr Baudis  <pasky@ucw.cz>
 
 	[BZ #2074]
diff --git a/libio/libio.h b/libio/libio.h
index 702a666fd5..bbfdd9d325 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -346,11 +346,11 @@ extern _IO_FILE *_IO_stderr attribute_hidden;
 typedef __ssize_t __io_read_fn (void *__cookie, char *__buf, size_t __nbytes);
 
 /* Write N bytes pointed to by BUF to COOKIE.  Write all N bytes
-   unless there is an error.  Return number of bytes written, or -1 if
-   there is an error without writing anything.  If the file has been
-   opened for append (__mode.__append set), then set the file pointer
-   to the end of the file and then do the write; if not, just write at
-   the current file pointer.  */
+   unless there is an error.  Return number of bytes written.  If
+   there is an error, return 0 and do not write anything.  If the file
+   has been opened for append (__mode.__append set), then set the file
+   pointer to the end of the file and then do the write; if not, just
+   write at the current file pointer.  */
 typedef __ssize_t __io_write_fn (void *__cookie, const char *__buf,
 				 size_t __n);