about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-04-11 21:03:01 +0200
committerAndreas Jaeger <jaegerandi@gmail.com>2012-04-11 21:03:57 +0200
commit288f9098cb550efe1420f26fc3fc2563bb4ea109 (patch)
tree517f998dd982159c1c994ef4051dcc2149f27fc8
parent4be2b5700315a99c6828ad314ed3e45ecf1c1527 (diff)
downloadglibc-288f9098cb550efe1420f26fc3fc2563bb4ea109.tar.gz
glibc-288f9098cb550efe1420f26fc3fc2563bb4ea109.tar.xz
glibc-288f9098cb550efe1420f26fc3fc2563bb4ea109.zip
Remove __wur from fwrite, fwrite_unlocked
        [BZ #11959]
        * libio/stdio.h (fwrite, fwrite_unlocked): Remove __wur.
        It is not necessarily an error to ignore fwrite's return
        value.  One can reliably use ferror to test for errors after
        the fact.
-rw-r--r--ChangeLog10
-rw-r--r--NEWS16
-rw-r--r--libio/stdio.h6
3 files changed, 20 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e8c0b100b..605a1e6860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-11  Jim Meyering  <meyering@redhat.com>
+
+        [BZ #11959]
+        * libio/stdio.h (fwrite, fwrite_unlocked): Remove __wur.
+        It is not necessarily an error to ignore fwrite's return
+        value.  One can reliably use ferror to test for errors after
+        the fact.
+
 2012-04-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* bits/types.h (__snseconds_t): New type.
@@ -11,7 +19,7 @@
 	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
 	(__SNSECONDS_T_TYPE): Likewise.
 
-2012-04-09  Andreas Jaeger  <aj@suse.de>
+2012-04-10  Andreas Jaeger  <aj@suse.de>
 
 	[BZ #2636]
 	* manual/time.texi (Processor Time): Return type of times is
diff --git a/NEWS b/NEWS
index c1bcf45a14..e7ae528c15 100644
--- a/NEWS
+++ b/NEWS
@@ -14,14 +14,14 @@ Version 2.16
   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, 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
+  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:
 
diff --git a/libio/stdio.h b/libio/stdio.h
index 9ca3ad3a28..8f495141f0 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -1,5 +1,5 @@
 /* Define ISO C stdio on top of C++ iostreams.
-   Copyright (C) 1991, 1994-2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -713,7 +713,7 @@ extern size_t fread (void *__restrict __ptr, size_t __size,
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern size_t fwrite (const void *__restrict __ptr, size_t __size,
-		      size_t __n, FILE *__restrict __s) __wur;
+		      size_t __n, FILE *__restrict __s);
 __END_NAMESPACE_STD
 
 #ifdef __USE_GNU
@@ -737,7 +737,7 @@ extern int fputs_unlocked (const char *__restrict __s,
 extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
 			      size_t __n, FILE *__restrict __stream) __wur;
 extern size_t fwrite_unlocked (const void *__restrict __ptr, size_t __size,
-			       size_t __n, FILE *__restrict __stream) __wur;
+			       size_t __n, FILE *__restrict __stream);
 #endif