From b9eb05d6bfd4c42c8ea614b77cbc50d95fee51d1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 12 Sep 1999 08:28:56 +0000 Subject: Update. 1999-09-12 Ulrich Drepper * locale/programs/ld-address.c: Fix handling of non-existing definitions for this category. Correctly ignore content of this category is this is necessary. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-identification.c: Likewise. * locale/programs/ld-measurement.c: Likewise. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-name.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-paper.c: Likewise. * locale/programs/ld-telephone.c: Likewise. * locale/programs/ld-time.c: Likewise. * locale/programs/locfile.h (handle_copy): Take extra parameter with result pointer. Fill in name of locale from which to copy. Correctly read token after `END'. * locale/programs/localedef.c (main): Correct handling copy. (add_to_readlist): Take extra parameter which says whether we are supposed to read the file or not. (find_locale): Call add_to_readlist with extra parameter set to 0. * locale/programs/localedef.h (struct localedef_t): Use __LC_LAST instead of wrong number in array definitions. (add_to_readlist): Update prototype. * locale/programs/locfile.c (locfile_read): Mark categories not available in source file as read. (write_all_categories): Fix typo. --- locale/programs/localedef.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'locale/programs/localedef.h') diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h index 075cf8982f..31721c5353 100644 --- a/locale/programs/localedef.h +++ b/locale/programs/localedef.h @@ -98,9 +98,11 @@ struct localedef_t struct locale_telephone_t *telephone; struct locale_measurement_t *measurement; struct locale_identification_t *identification; - } categories[12]; + } categories[__LC_LAST]; - size_t len[12]; + size_t len[__LC_LAST]; + + const char *copy_name[__LC_LAST]; const char *repertoire_name; }; @@ -121,7 +123,8 @@ extern char *xstrdup (const char *__str); /* Mark given locale as to be read. */ extern struct localedef_t *add_to_readlist (int locale, const char *name, - const char *repertoire_name); + const char *repertoire_name, + int generate); /* Find the information for the locale NAME. */ extern struct localedef_t *find_locale (int locale, const char *name, -- cgit v1.2.3