From 98727dbea212799beb7a15eeb9a21c8c5d100267 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 25 Dec 2010 13:56:48 -0500 Subject: Change XPG-compliant strerror_r function to return error code. --- sysdeps/mach/xpg-strerror.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'sysdeps') 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; -- cgit 1.4.1