[Commits] r18026 - in /fsf/trunk/libc: ChangeLog NEWS libio/libio.h manual/stdio.texi

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Apr 13 00:05:34 2012
New Revision: 18026

Log:
Import glibc-mainline for 2012-04-13

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/libio/libio.h
    fsf/trunk/libc/manual/stdio.texi

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Apr 13 00:05:34 2012
@@ -1,3 +1,14 @@
+2012-04-12  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	[BZ #2074]
+	* libio/libio.h (__io_write_fn): Update comment.
+
+2012-04-12  Petr Baudis  <pasky@xxxxxx>
+
+	[BZ #2074]
+	* stdio.texi (Hook Functions): The user provided writer function
+	is not allowed to return -1.
+
 2012-04-11  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/sparc/fpu/libm-test-ulps: Update.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Apr 13 00:05:34 2012
@@ -9,19 +9,19 @@
 
 * The following bugs are resolved with this release:
 
-  174, 350, 369, 411, 706, 2541, 2547, 2548, 2551, 2552, 2553, 2554, 2562,
-  2563, 2565, 2566, 2576, 2636, 2678, 3335, 3866, 3868, 3976, 3992, 4026,
-  4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730,
-  6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140,
-  10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365, 11451,
-  11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526, 13527, 13528,
-  13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555,
-  13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673, 13691,
-  13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761, 13786, 13792,
-  13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13871,
-  13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910, 13911, 13912,
-  13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926, 13928,
-  13938, 13963, 13967
+  174, 350, 369, 411, 706, 2074, 2541, 2547, 2548, 2551, 2552, 2553, 2554,
+  2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3866, 3868, 3976, 3992,
+  4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649,
+  6730, 6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135,
+  10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365,
+  11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526, 13527,
+  13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553,
+  13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673,
+  13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761, 13786,
+  13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854,
+  13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910, 13911,
+  13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926,
+  13928, 13938, 13963, 13967
 
 * ISO C11 support:
 

Modified: fsf/trunk/libc/libio/libio.h
==============================================================================
--- fsf/trunk/libc/libio/libio.h (original)
+++ fsf/trunk/libc/libio/libio.h Fri Apr 13 00:05:34 2012
@@ -346,11 +346,11 @@
 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);
 

Modified: fsf/trunk/libc/manual/stdio.texi
==============================================================================
--- fsf/trunk/libc/manual/stdio.texi (original)
+++ fsf/trunk/libc/manual/stdio.texi Fri Apr 13 00:05:34 2012
@@ -5021,7 +5021,8 @@
 This is very similar to the @code{write} function; see @ref{I/O
 Primitives}.  Your function should transfer up to @var{size} bytes from
 the buffer, and return the number of bytes written.  You can return a
-value of @code{-1} to indicate an error.
+value of @code{0} to indicate an error.  You must not return any
+negative value.
 
 You should define the function to perform seek operations on the cookie
 as:

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits