aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2010-12-25 13:56:48 -0500
committerUlrich Drepper <drepper@gmail.com>2010-12-25 13:56:48 -0500
commit98727dbea212799beb7a15eeb9a21c8c5d100267 (patch)
treec265c48eaf3a67cc1d8dc54c487c84285bcdc0bd
parent8bdf4e6eb88d2174ccf20c7180658fd9e816a7d8 (diff)
downloadglibc-98727dbea212799beb7a15eeb9a21c8c5d100267.zip
glibc-98727dbea212799beb7a15eeb9a21c8c5d100267.tar.gz
glibc-98727dbea212799beb7a15eeb9a21c8c5d100267.tar.bz2
Change XPG-compliant strerror_r function to return error code.
-rw-r--r--ChangeLog6
-rw-r--r--string/xpg-strerror.c13
-rw-r--r--sysdeps/mach/xpg-strerror.c17
3 files changed, 14 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 497de67..c29dd53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-25 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12204]
+ * string/xpg-strerror.c (__xpg_strerror_r): Return error code, not -1.
+ * sysdeps/mach/xpg-strerror.c (__xpg_strerror_r): Likewise.
+
2010-12-15 H.J. Lu <hongjiu.lu@intel.com>
* config.h.in (NO_CTORS_DTORS_SECTIONS): Define.
diff --git a/string/xpg-strerror.c b/string/xpg-strerror.c
index 5cb56cd..8d89812 100644
--- a/string/xpg-strerror.c
+++ b/string/xpg-strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -39,18 +39,13 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
{
if (errnum < 0 || errnum >= _sys_nerr_internal
|| _sys_errlist_internal[errnum] == NULL)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
+
const char *estr = (const char *) _(_sys_errlist_internal[errnum]);
size_t estrlen = strlen (estr) + 1;
if (buflen < estrlen)
- {
- __set_errno (ERANGE);
- return -1;
- }
+ return ERANGE;
memcpy (buf, estr, estrlen);
return 0;
diff --git a/sysdeps/mach/xpg-strerror.c b/sysdeps/mach/xpg-strerror.c
index 8d0b31e..efaf0be 100644
--- a/sysdeps/mach/xpg-strerror.c
+++ b/sysdeps/mach/xpg-strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -53,30 +53,21 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
code = err_get_code (errnum);
if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
es = &__mach_error_systems[system];
if (sub >= es->max_sub)
estr = (const char *) es->bad_sub;
else if (code >= es->subsystem[sub].max_code)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
else
estr = (const char *) _(es->subsystem[sub].codes[code]);
size_t estrlen = strlen (estr) + 1;
if (buflen < estrlen)
- {
- __set_errno (ERANGE);
- return -1;
- }
+ return ERANGE;
memcpy (buf, estr, estrlen);
return 0;