strerror_r-posix: work with glibc 2.13

* lib/strerror_r.c (strerror_r): Fix return type.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index bdfb3182ec1d93cb3439ec0bad0e96b2f8e4d149..21a0936d0463aa347fb5dde5577a3bbc952ac853 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Eric Blake  <eblake@redhat.com>
+
+       strerror_r-posix: work with glibc 2.13
+       * lib/strerror_r.c (strerror_r): Fix return type.
+
 2011-01-21  Pádraig Brady  <P@draigBrady.com>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index 0cc02889b1a3d0c4d3213640881d2883e218aa3d..57a7e8f722acbb44bcd54afdcb4adf79b7261f0b 100644 (file)
--- a/lib/strerror_r.c
+++ b/lib/strerror_r.c
@@ -98,7 +98,7 @@ strerror_r (int errnum, char *buf, size_t buflen)
   extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen);
 
   int ret = __xpg_strerror_r (errnum, buf, buflen);
-  return (ret < 0 ? errno : 0);
+  return (ret < 0 ? errno : ret);
 }
 
 #else /* (__GLIBC__ >= 2 || defined __UCLIBC__ ? !HAVE___XPG_STRERROR_R : !HAVE_DECL_STRERROR_R) || EXTEND_STRERROR_R */