Loading...
--- Libc/Libc-1044.10.1/string/FreeBSD/strerror.c
+++ Libc/Libc-763.13/string/FreeBSD/strerror.c
@@ -41,7 +41,6 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
-#include <stdlib.h>
#define UPREFIX "Unknown error"
@@ -53,13 +52,12 @@
*/
#define EBUFSIZE (20 + 2 + sizeof(UPREFIX))
-#ifndef BUILDING_VARIANT
/*
* Doing this by hand instead of linking with stdio(3) avoids bloat for
* statically linked binaries.
*/
-__private_extern__ void
-__errstr(int num, char *uprefix, char *buf, size_t len)
+static void
+errstr(int num, char *uprefix, char *buf, size_t len)
{
char *t;
unsigned int uerr;
@@ -89,8 +87,8 @@
catd = catopen("libc", NL_CAT_LOCALE);
#endif
- if (errnum < 0 || errnum >= sys_nerr) {
- __errstr(errnum,
+ if (errnum < 1 || errnum >= sys_nerr) {
+ errstr(errnum,
#if defined(NLS)
catgets(catd, 1, 0xffff, UPREFIX),
#else
@@ -117,31 +115,12 @@
return (retval);
}
-__private_extern__ char *__strerror_ebuf = NULL;
-#else /* BUILDING_VARIANT */
-__private_extern__ void __errstr(int, char *, size_t);
-
-extern char *__strerror_ebuf;
-#endif /* !BUILDING_VARIANT */
-
char *
strerror(int num)
{
- // Dynamically allocate a big buffer to receive the text then shrink it
- // down to the actual size needed.
- size_t ebufsiz = NL_TEXTMAX;
+ static char ebuf[NL_TEXTMAX];
- if (__strerror_ebuf == NULL) {
- __strerror_ebuf = calloc(1, ebufsiz);
- if (__strerror_ebuf == NULL) {
- return NULL;
- }
- }
-
- if (strerror_r(num, __strerror_ebuf, ebufsiz) != 0) {
-#if !__DARWIN_UNIX03
- errno = EINVAL;
-#endif
- }
- return __strerror_ebuf;
+ if (strerror_r(num, ebuf, sizeof(ebuf)) != 0)
+ errno = EINVAL;
+ return (ebuf);
}