From 32482f61da7650ff10741bd5aedd66bbc3ea165b Mon Sep 17 00:00:00 2001 From: Jens Gustedt Date: Wed, 3 Jan 2018 14:17:12 +0100 Subject: revise the definition of multiple basic locks in the code In all cases this is just a change from two volatile int to one. --- src/locale/dcngettext.c | 2 +- src/locale/locale_map.c | 2 +- src/locale/setlocale.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/locale') diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c index b79b7010..d8af9603 100644 --- a/src/locale/dcngettext.c +++ b/src/locale/dcngettext.c @@ -34,7 +34,7 @@ static char *gettextdir(const char *domainname, size_t *dirlen) char *bindtextdomain(const char *domainname, const char *dirname) { - static volatile int lock[2]; + static volatile int lock[1]; struct binding *p, *q; if (!domainname) return 0; diff --git a/src/locale/locale_map.c b/src/locale/locale_map.c index 188fcf39..79542310 100644 --- a/src/locale/locale_map.c +++ b/src/locale/locale_map.c @@ -26,7 +26,7 @@ static const char envvars[][12] = { const struct __locale_map *__get_locale(int cat, const char *val) { - static volatile int lock[2]; + static volatile int lock[1]; static void *volatile loc_head; const struct __locale_map *p; struct __locale_map *new = 0; diff --git a/src/locale/setlocale.c b/src/locale/setlocale.c index 623660cc..40bc7ece 100644 --- a/src/locale/setlocale.c +++ b/src/locale/setlocale.c @@ -21,7 +21,7 @@ char *__strchrnul(const char *, int); char *setlocale(int cat, const char *name) { - static volatile int lock[2]; + static volatile int lock[1]; if ((unsigned)cat > LC_ALL) return 0; -- cgit v1.2.1