bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] strerror_r-posix: work with glibc 2.13


From: Eric Blake
Subject: [PATCH] strerror_r-posix: work with glibc 2.13
Date: Fri, 21 Jan 2011 08:50:11 -0700

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

Signed-off-by: Eric Blake <address@hidden>
---

The latest glibc 2.13 fixed strerror_r to give a positive
return value on error, but we were converting that to success.

 ChangeLog        |    5 +++++
 lib/strerror_r.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdfb318..21a0936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Eric Blake  <address@hidden>
+
+       strerror_r-posix: work with glibc 2.13
+       * lib/strerror_r.c (strerror_r): Fix return type.
+
 2011-01-21  Pádraig Brady  <address@hidden>
             Bruno Haible  <address@hidden>

diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index 0cc0288..57a7e8f 100644
--- 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 */
-- 
1.7.3.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]