OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change XPG-compliant strerror_r function to return error code.

This commit is contained in:
Ulrich Drepper 2010-12-25 13:56:48 -05:00
parent 8bdf4e6eb8
commit 98727dbea2
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

13
string/xpg-strerror.c
View File

@ -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;

17
sysdeps/mach/xpg-strerror.c
View File

@ -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;