diff options
Diffstat (limited to 'locale/programs/ld-paper.c')
| -rw-r--r-- | locale/programs/ld-paper.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c index 2fc78202a2..334d405ca8 100644 --- a/locale/programs/ld-paper.c +++ b/locale/programs/ld-paper.c @@ -57,7 +57,7 @@ paper_startup (struct linereader *lr, struct localedef_t *locale, void -paper_finish (struct localedef_t *locale, struct charmap_t *charmap) +paper_finish (struct localedef_t *locale, const struct charmap_t *charmap) { struct locale_paper_t *paper = locale->categories[LC_PAPER].paper; int nothing = 0; @@ -114,7 +114,7 @@ paper_finish (struct localedef_t *locale, struct charmap_t *charmap) void -paper_output (struct localedef_t *locale, struct charmap_t *charmap, +paper_output (struct localedef_t *locale, const struct charmap_t *charmap, const char *output_path) { struct locale_paper_t *paper = locale->categories[LC_PAPER].paper; @@ -158,7 +158,7 @@ paper_output (struct localedef_t *locale, struct charmap_t *charmap, /* The parser for the LC_PAPER section of the locale definition. */ void paper_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_paper_t *paper; @@ -171,7 +171,7 @@ paper_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); @@ -197,7 +197,7 @@ paper_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; } @@ -214,7 +214,7 @@ paper_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_number) \ goto err_label; \ else if (paper->cat != 0) \ @@ -229,7 +229,7 @@ paper_read (struct linereader *ldfile, struct localedef_t *result, case tok_end: /* Next we assume `LC_PAPER'. */ - 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) @@ -246,7 +246,7 @@ paper_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; } |