-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
#include <assert.h>
#include <errno.h>
which are somehow addressed. */
struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
-const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR;
+const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
/* Checks if the name is actually present, that is, not NULL and not
empty. */
}
struct __locale_data *
-internal_function
_nl_find_locale (const char *locale_path, size_t locale_path_len,
int category, const char **name)
{
variables. */
cloc_name = getenv ("LC_ALL");
if (!name_present (cloc_name))
- cloc_name = getenv (_nl_category_names.str
- + _nl_category_name_idxs[category]);
+ cloc_name = getenv (_nl_category_names_get (category));
if (!name_present (cloc_name))
cloc_name = getenv ("LANG");
if (!name_present (cloc_name))
locale_path, locale_path_len, mask,
language, territory, codeset,
normalized_codeset, modifier,
- _nl_category_names.str
- + _nl_category_name_idxs[category], 0);
+ _nl_category_names_get (category), 0);
if (locale_file == NULL)
{
locale_path, locale_path_len, mask,
language, territory, codeset,
normalized_codeset, modifier,
- _nl_category_names.str
- + _nl_category_name_idxs[category], 1);
+ _nl_category_names_get (category), 1);
if (locale_file == NULL)
/* This means we are out of core. */
return NULL;
/* Calling this function assumes the lock for handling global locale data
is acquired. */
void
-internal_function
_nl_remove_locale (int locale, struct __locale_data *data)
{
if (--data->usage_count == 0)