OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* locale/programs/localedef.c (add_to_readlist): Error about

Browse Source 
circular dependencies only if the locale in question hasn't
	been finished.
	* locale/programs/linereader.c (get_string): Pass LC_CTYPE not
	CTYPE_LOCALE to load_locale.
	* locale/programs/locfile.c (locfile_read): Don't include
	unneeded but available locales in locale_mask.

	* locale/programs/locarchive.c (enlarge_archive): If quiet, don't
	print any messages about enlarging archive.
This commit is contained in:
Roland McGrath 2002-08-20 23:10:34 +00:00
parent c6c6dd4803
commit 69f6a804b0
7 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2002-08-15 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.c (add_to_readlist): Error about
circular dependencies only if the locale in question hasn't
been finished.
* locale/programs/linereader.c (get_string): Pass LC_CTYPE not
CTYPE_LOCALE to load_locale.
* locale/programs/locfile.c (locfile_read): Don't include
unneeded but available locales in locale_mask.
* locale/programs/locarchive.c (enlarge_archive): If quiet, don't
print any messages about enlarging archive.
2002-08-20 Brian Youmans <3diff@gnu.org>
* manual/contrib.texi: Removed licenses, added acknowledgements

2
locale/programs/linereader.c
View File

@ -735,7 +735,7 @@ non-symbolic character value should not be used"));
int old_needed = locale->needed;
locale->needed = 0;
locale = load_locale (CTYPE_LOCALE,
locale = load_locale (LC_CTYPE,
locale->name,
locale->repertoire_name,
charmap, locale);

4
locale/programs/localedef.c
View File

@ -561,7 +561,9 @@ add_to_readlist (int locale, const char *name, const char *repertoire_name,
}
}
if (generate && (runp->needed & (1 << locale)) != 0)
if (generate
&& (runp->needed & (1 << locale)) != 0
&& (runp->avail & (1 << locale)) == 0)
WITH_CUR_LOCALE (error (5, 0, _("\
circular dependencies between locale definitions")));

5
locale/programs/locarchive.c
View File

@ -259,8 +259,9 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
should be double from what is currently used. */
newhead.namehash_size = MAX (next_prime (2 * newhead.namehash_used),
newhead.namehash_size);
printf ("name: size: %u, used: %d, new: size: %u\n",
head->namehash_size, head->namehash_used, newhead.namehash_size);
if (! be_quiet)
printf ("name: size: %u, used: %d, new: size: %u\n",
head->namehash_size, head->namehash_used, newhead.namehash_size);
newhead.string_offset = (newhead.namehash_offset
+ (newhead.namehash_size

2
locale/programs/locfile.c
View File

@ -47,7 +47,7 @@ locfile_read (struct localedef_t *result, const struct charmap_t *charmap)
{
const char *filename = result->name;
const char *repertoire_name = result->repertoire_name;
int locale_mask = result->needed ^ result->avail;
int locale_mask = result->needed & ~result->avail;
struct linereader *ldfile;
int not_here = ALL_LOCALES;

5
localedata/ChangeLog
View File

@ -1,3 +1,8 @@
2002-08-15 Jakub Jelinek <jakub@redhat.com>
* charmaps/BIG5-HKSCS (WIDTH): Change <UE000> to <UE003> at start of
range.
2002-08-09 Roland McGrath <roland@redhat.com>
* Makefile ($(INSTALL-SUPPORTED-LOCALES)): Pass --alias-file option to

2
localedata/charmaps/BIG5-HKSCS
View File

@ -18309,5 +18309,5 @@ WIDTH
<U30FD>...<U30F6> 2
<UF7E5>...<U2EE3> 2
<U7881>...<U256F> 2
<UE000>...<U79D4> 2
<UE003>...<U79D4> 2
END WIDTH