summary refs log tree commit diff
diff options
context:
space:
mode:
authorCyril Hrubis <metan@ucw.cz>2012-06-15 09:09:05 +0200
committerAndreas Jaeger <aj@suse.de>2012-06-15 09:09:59 +0200
commita3aeac403e69ad264274f0e24a16066376a84708 (patch)
tree366ddf4907dd310d657338de11fccf46bf820068
parent49bdf4c19d35c8ae4070699dc0267db3b9a7d79c (diff)
downloadglibc-a3aeac403e69ad264274f0e24a16066376a84708.tar.gz
glibc-a3aeac403e69ad264274f0e24a16066376a84708.tar.xz
glibc-a3aeac403e69ad264274f0e24a16066376a84708.zip
Add __wur to GNU version of strerror_r.
Not using the result of the GNU strerror_r() is always a mistake.

Moreover this would generate warning if XSI version was expected but GNU
version was used instead (because some random used header defined
_GNU_SOURCE which was Python.h in this case).
-rw-r--r--ChangeLog4
-rw-r--r--string/string.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 62638615be..d0972ea17f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Cyril Hrubis  <metan@ucw.cz>
+
+	* string/string.h: Add __wur to GNU version of strerror_r.
+
 2012-06-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14229]
diff --git a/string/string.h b/string/string.h
index 7bb505fc64..879410aee0 100644
--- a/string/string.h
+++ b/string/string.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2004,2007,2009,2010,2012
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
@@ -433,7 +432,7 @@ extern int __xpg_strerror_r (int __errnum, char *__buf, size_t __buflen)
 /* If a temporary buffer is required, at most BUFLEN bytes of BUF will be
    used.  */
 extern char *strerror_r (int __errnum, char *__buf, size_t __buflen)
-     __THROW __nonnull ((2));
+     __THROW __nonnull ((2)) __wur;
 # endif
 #endif