diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 4 | ||||
| -rw-r--r-- | string/strerror.c | 6 | ||||
| -rw-r--r-- | string/strerror_r.c | 31 |
3 files changed, 4 insertions, 37 deletions
diff --git a/string/Makefile b/string/Makefile index 93d68a45be..e766429c52 100644 --- a/string/Makefile +++ b/string/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. +# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ headers := string.h strings.h memory.h endian.h bits/endian.h \ routines := strcat strchr strcmp strcoll strcpy strcspn \ strverscmp strdup strndup \ - strerror _strerror strerror_r strlen strnlen \ + strerror _strerror strlen strnlen \ strncat strncmp strncpy \ strrchr strpbrk strsignal strspn strstr strtok \ strtok_r strxfrm memchr memcmp memmove memset \ diff --git a/string/strerror.c b/string/strerror.c index 7052ef64d6..4b3234233d 100644 --- a/string/strerror.c +++ b/string/strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 93, 94, 95, 96, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,8 +19,6 @@ #include <stdio.h> #include <string.h> -extern char *_strerror_internal __P ((int, char *, size_t)); - /* Return a string describing the errno code in ERRNUM. The storage is good only until the next call to strerror. Writing to the storage causes undefined behavior. */ @@ -29,5 +27,5 @@ strerror (errnum) int errnum; { static char buf[1024]; - return _strerror_internal (errnum, buf, sizeof buf); + return __strerror_r (errnum, buf, sizeof buf); } diff --git a/string/strerror_r.c b/string/strerror_r.c deleted file mode 100644 index fc967441be..0000000000 --- a/string/strerror_r.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1991, 93, 94, 95, 96, 98 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <stdio.h> -#include <string.h> - -extern char *_strerror_internal __P ((int, char *, size_t)); - -/* Return a string describing the errno code in ERRNUM. If a temporary - buffer is required, at most BUFLEN bytes of BUF will be used. */ -char * -__strerror_r (int errnum, char *buf, size_t buflen) -{ - return _strerror_internal (errnum, buf, buflen); -} -weak_alias (__strerror_r, strerror_r) |