diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-05-14 17:56:25 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-07 14:10:58 -0300 |
| commit | 725eeb4af14c6fec4ed26a796cdfd6d50df86d42 (patch) | |
| tree | d42f43a268e498d3ff8a891ef274747e4f2a0795 /string | |
| parent | 28aff047818eb1726394296d27b9c7885340bead (diff) | |
| download | glibc-725eeb4af14c6fec4ed26a796cdfd6d50df86d42.tar.gz glibc-725eeb4af14c6fec4ed26a796cdfd6d50df86d42.tar.xz glibc-725eeb4af14c6fec4ed26a796cdfd6d50df86d42.zip | |
string: Use tls-internal on strerror_l
The buffer allocation uses the same strategy of strsignal. Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'string')
| -rw-r--r-- | string/strerror_l.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/string/strerror_l.c b/string/strerror_l.c index 017bd14b99..a203e9e80b 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -18,11 +18,8 @@ #include <libintl.h> #include <locale.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <errno.h> - -static __thread char *last_value; +#include <tls-internal.h> static const char * @@ -43,12 +40,13 @@ __strerror_l (int errnum, locale_t loc) char *err = (char *) __get_errlist (errnum); if (__glibc_unlikely (err == NULL)) { - free (last_value); - if (__asprintf (&last_value, "%s%d", + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strerror_l_buf); + if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", translate ("Unknown error ", loc), errnum) == -1) - last_value = NULL; + tls_internal->strerror_l_buf = NULL; - err = last_value; + err = tls_internal->strerror_l_buf; } else err = (char *) translate (err, loc); @@ -58,10 +56,3 @@ __strerror_l (int errnum, locale_t loc) } weak_alias (__strerror_l, strerror_l) libc_hidden_def (__strerror_l) - -void -__strerror_thread_freeres (void) -{ - free (last_value); -} -text_set_element (__libc_subfreeres, __strerror_thread_freeres); |