diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | string/xpg-strerror.c | 13 | ||||
| -rw-r--r-- | sysdeps/mach/xpg-strerror.c | 17 |
3 files changed, 14 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 497de673a0..c29dd53c47 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 5cb56cdfb8..8d898122d1 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 8d0b31e600..efaf0be291 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; |