diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-12-10 01:37:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-12-10 01:37:56 +0000 |
| commit | 47e8b4439dda245845e85dfbb054693a9b132635 (patch) | |
| tree | ef27110e00f1a9f726c74c2f8473499ccf3dd0de /locale/programs/ld-telephone.c | |
| parent | a352ab4ca56142647227c3d2943adfa455679ada (diff) | |
| download | glibc-47e8b4439dda245845e85dfbb054693a9b132635.tar.gz | |
Update.
2001-12-09 Ulrich Drepper <drepper@redhat.com>
Implement transliteration of characters in strings of the locale
definitions.
* locale/programs/linereader.c: Adjust for additional parameter to
lr_token.
(get_string): If character <Uxxxx> is not found try to transliterate
it.
* locale/programs/ld-ctype.c: Adjust for additional parameter to
lr_token. Add const to charmap parameter of all functions.
(find_translit, find_translit2): New functions.
* locale/programs/charmap.c: Adjust for additional parameter to
lr_token.
* locale/programs/repertoire.c: Likewise.
* locale/programs/linereader.h: Likewise.
* locale/programs/ld-address.c: Likewise. Add const to charmap
parameter of all functions.
* locale/programs/ld-collate.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-paper.c: Likewise.
* locale/programs/ld-telephone.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* locale/programs/locfile.c: Likewise.
* locale/programs/localedef.c: Likewise.
* locale/programs/localedef.h: Likewise.
* locale/programs/locfile.h: Likewise. Add declaration for
find_translit.
* locale/programs/simple-hash.c: Add const to first parameter of
find_entry, iterate_table, and lookup.
* locale/programs/simple-hash.h: Likewise.
* locale/localeinfo.h: Don't define __LC_LAST here. Include <locale.h>
instead.
* include/locale.h: Define __LC_LAST.
* iconv/Makefile (CFLAGS-linereader.c): Define to -DNO_TRANSLITERATION.
Diffstat (limited to 'locale/programs/ld-telephone.c')
| -rw-r--r-- | locale/programs/ld-telephone.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c index 31cfd25041..a66b48d436 100644 --- a/locale/programs/ld-telephone.c +++ b/locale/programs/ld-telephone.c @@ -59,7 +59,7 @@ telephone_startup (struct linereader *lr, struct localedef_t *locale, void -telephone_finish (struct localedef_t *locale, struct charmap_t *charmap) +telephone_finish (struct localedef_t *locale, const struct charmap_t *charmap) { struct locale_telephone_t *telephone = locale->categories[LC_TELEPHONE].telephone; @@ -170,7 +170,7 @@ telephone_finish (struct localedef_t *locale, struct charmap_t *charmap) void -telephone_output (struct localedef_t *locale, struct charmap_t *charmap, +telephone_output (struct localedef_t *locale, const struct charmap_t *charmap, const char *output_path) { struct locale_telephone_t *telephone = @@ -225,7 +225,7 @@ telephone_output (struct localedef_t *locale, struct charmap_t *charmap, /* The parser for the LC_TELEPHONE section of the locale definition. */ void telephone_read (struct linereader *ldfile, struct localedef_t *result, - struct charmap_t *charmap, const char *repertoire_name, + const struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { struct locale_telephone_t *telephone; @@ -238,7 +238,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, do { - now = lr_token (ldfile, charmap, NULL, verbose); + now = lr_token (ldfile, charmap, result, NULL, verbose); nowtok = now->tok; } while (nowtok == tok_eol); @@ -264,7 +264,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, /* Ingore empty lines. */ if (nowtok == tok_eol) { - now = lr_token (ldfile, charmap, NULL, verbose); + now = lr_token (ldfile, charmap, result, NULL, verbose); nowtok = now->tok; continue; } @@ -281,7 +281,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, break; \ } \ \ - arg = lr_token (ldfile, charmap, NULL, verbose); \ + arg = lr_token (ldfile, charmap, result, NULL, verbose); \ if (arg->tok != tok_string) \ goto err_label; \ if (telephone->cat != NULL) \ @@ -304,7 +304,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, case tok_end: /* Next we assume `LC_TELEPHONE'. */ - arg = lr_token (ldfile, charmap, NULL, verbose); + arg = lr_token (ldfile, charmap, result, NULL, verbose); if (arg->tok == tok_eof) break; if (arg->tok == tok_eol) @@ -321,7 +321,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, } /* Prepare for the next round. */ - now = lr_token (ldfile, charmap, NULL, verbose); + now = lr_token (ldfile, charmap, result, NULL, verbose); nowtok = now->tok; } |