diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-05-15 18:36:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-05-15 18:36:28 +0000 |
| commit | 9446614c28b003812b59e99ff1f38aa526234c1c (patch) | |
| tree | c7109087c02a598a6d4bb5cba4f77d6e62ce7d12 /locale/loadlocale.c | |
| parent | 88dbff8cf980b4b63bdbb0e987489bc20176f220 (diff) | |
| download | glibc-9446614c28b003812b59e99ff1f38aa526234c1c.tar glibc-9446614c28b003812b59e99ff1f38aa526234c1c.tar.gz glibc-9446614c28b003812b59e99ff1f38aa526234c1c.tar.bz2 glibc-9446614c28b003812b59e99ff1f38aa526234c1c.zip | |
* locale/setlocale.c: Change _nl_category_names into a string.
Add new _nl_category_name_idxs. Change all users.
* locale/localeinfo.h: Adjust declaration of _nl_category_names.
Declare _nl_category_name_idxs.
* locale/findlocale.c: Adjust for _nl_category_names change.
* locale/loadlocale.c: Likewise.
* locale/newlocale.c: Likewise.
* intl/dcigettext.c: Likewise.
Diffstat (limited to 'locale/loadlocale.c')
| -rw-r--r-- | locale/loadlocale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/loadlocale.c b/locale/loadlocale.c index 2a5935087c..467dff157a 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -1,5 +1,5 @@ /* Functions to read locale data files. - Copyright (C) 1996-2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1996-2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -198,7 +198,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) + 5 + _nl_category_name_sizes[category] + 1); __mempcpy (__mempcpy (__mempcpy (newp, file->filename, filenamelen), "/SYS_", 5), - _nl_category_names[category], + _nl_category_names.str + _nl_category_name_idxs[category], _nl_category_name_sizes[category] + 1); fd = open_not_cancel_2 (newp, O_RDONLY); |