summaryrefslogtreecommitdiff
path: root/lib/duplocale.c
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-12-18 16:30:09 +0100
committerBruno Haible <bruno@clisp.org>2019-12-18 16:33:48 +0100
commit3a310962887322e0b94708984886de643f94f8a5 (patch)
treed17f7545cbae02461db7cc47a219396a6faf7a33 /lib/duplocale.c
parentf7efd84ea3e6ff2be5932b5213ac60c5c022f5b9 (diff)
downloadgnulib-3a310962887322e0b94708984886de643f94f8a5.tar.gz
setlocale-null: Make API more useful.
* lib/locale.in.h (setlocale_null_r): Renamed from setlocale_null. All callers changed. (setlocale_null): New declaration. * lib/setlocale_null.c (setlocale_null_androidfix): New function, extracted from setlocale_null_unlocked. (setlocale_null_unlocked): Invoke it. (setlocale_null_r): Renamed from setlocale_null. (setlocale_null): New function, extracted from setlocale_mtsafe in setlocale.c. * lib/setlocale.c: Don't include <errno.h>. (setlocale_mtsafe): Invoke setlocale_null. * lib/setlocale-lock.c: Update comments. * doc/posix-functions/setlocale.texi: Mention both functions.
Diffstat (limited to 'lib/duplocale.c')
-rw-r--r--lib/duplocale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/duplocale.c b/lib/duplocale.c
index d22a447a91..da94d44559 100644
--- a/lib/duplocale.c
+++ b/lib/duplocale.c
@@ -72,7 +72,7 @@ rpl_duplocale (locale_t locale)
locale_t base_copy;
unsigned int i;
- err = setlocale_null (LC_CTYPE, base_name, sizeof (base_name));
+ err = setlocale_null_r (LC_CTYPE, base_name, sizeof (base_name));
if (err)
{
errno = err;
@@ -88,7 +88,7 @@ rpl_duplocale (locale_t locale)
int category_mask = categories[i].mask;
char name[SETLOCALE_NULL_MAX];
- err = setlocale_null (category, name, sizeof (name));
+ err = setlocale_null_r (category, name, sizeof (name));
if (err)
{
errno = err;