1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00

* 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.
This commit is contained in:
Ulrich Drepper
2006-05-15 18:36:28 +00:00
parent 88dbff8cf9
commit 9446614c28
7 changed files with 62 additions and 23 deletions

View File

@@ -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);