diff options
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/ld-address.c | 9 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 6 | ||||
| -rw-r--r-- | locale/programs/ld-identification.c | 12 | ||||
| -rw-r--r-- | locale/programs/ld-measurement.c | 11 | ||||
| -rw-r--r-- | locale/programs/ld-messages.c | 4 | ||||
| -rw-r--r-- | locale/programs/ld-monetary.c | 9 | ||||
| -rw-r--r-- | locale/programs/ld-name.c | 11 | ||||
| -rw-r--r-- | locale/programs/ld-numeric.c | 9 | ||||
| -rw-r--r-- | locale/programs/ld-paper.c | 9 | ||||
| -rw-r--r-- | locale/programs/ld-telephone.c | 9 | ||||
| -rw-r--r-- | locale/programs/ld-time.c | 4 | ||||
| -rw-r--r-- | locale/programs/locfile.h | 6 |
12 files changed, 31 insertions, 68 deletions
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index 187b5460ae..3b743638a8 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -416,16 +416,11 @@ address_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_address_t *address; struct token *now; struct token *arg; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_ADDRESS' must be free. */ lr_ignore_rest (ldfile, 1); @@ -440,7 +435,7 @@ address_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_address, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_address, LC_ADDRESS, "LC_ADDRESS", ignore_content); return; } diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 231df137ea..0f40362768 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -1855,8 +1855,8 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_ctype, LC_CTYPE, - "LC_CTYPE", ignore_content); + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_ctype, + LC_CTYPE, "LC_CTYPE", ignore_content); return; } diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c index b14db505ed..bc252a018f 100644 --- a/locale/programs/ld-identification.c +++ b/locale/programs/ld-identification.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -289,7 +289,6 @@ identification_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_identification_t *identification; struct token *now; struct token *arg; @@ -297,10 +296,6 @@ identification_read (struct linereader *ldfile, struct localedef_t *result, int category; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_IDENTIFICATION' must be free. */ lr_ignore_rest (ldfile, 1); @@ -314,8 +309,9 @@ identification_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_identification, - LC_IDENTIFICATION, "LC_IDENTIFICATION", ignore_content); + handle_copy (ldfile, charmap, repertoire_name, result, + tok_lc_identification, LC_IDENTIFICATION, + "LC_IDENTIFICATION", ignore_content); return; } diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c index c3dbf5f705..68bb3a2d3b 100644 --- a/locale/programs/ld-measurement.c +++ b/locale/programs/ld-measurement.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -160,10 +160,6 @@ measurement_read (struct linereader *ldfile, struct localedef_t *result, struct token *arg; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_MEASUREMENT' must be free. */ lr_ignore_rest (ldfile, 1); @@ -177,8 +173,9 @@ measurement_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_measurement, - LC_MEASUREMENT, "LC_MEASUREMENT", ignore_content); + handle_copy (ldfile, charmap, repertoire_name, result, + tok_lc_measurement, LC_MEASUREMENT, "LC_MEASUREMENT", + ignore_content); return; } diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c index 2ee4bda69e..6ca2d8ad4f 100644 --- a/locale/programs/ld-messages.c +++ b/locale/programs/ld-messages.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -253,7 +253,7 @@ messages_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_messages, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_messages, LC_MESSAGES, "LC_MESSAGES", ignore_content); return; } diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index c761ae24c0..6a7655817c 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -595,15 +595,10 @@ monetary_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_monetary_t *monetary; struct token *now; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_MONETARY' must be free. */ lr_ignore_rest (ldfile, 1); @@ -617,7 +612,7 @@ monetary_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_monetary, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_monetary, LC_MONETARY, "LC_MONETARY", ignore_content); return; } diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c index 39ab22c2f7..6eeecd4d9d 100644 --- a/locale/programs/ld-name.c +++ b/locale/programs/ld-name.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -213,16 +213,11 @@ name_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_name_t *name; struct token *now; struct token *arg; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_NAME' must be empty. */ lr_ignore_rest (ldfile, 1); @@ -236,8 +231,8 @@ name_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_name, LC_NAME, - "LC_NAME", ignore_content); + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_name, + LC_NAME, "LC_NAME", ignore_content); return; } diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index b35e6d60f5..e61db91e8b 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -182,15 +182,10 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_numeric_t *numeric; struct token *now; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_NUMERIC' must be free. */ lr_ignore_rest (ldfile, 1); @@ -205,7 +200,7 @@ numeric_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_numeric, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_numeric, LC_NUMERIC, "LC_NUMERIC", ignore_content); return; } diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c index 2c1e4c64fb..19cf22587c 100644 --- a/locale/programs/ld-paper.c +++ b/locale/programs/ld-paper.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -156,16 +156,11 @@ paper_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_paper_t *paper; struct token *now; struct token *arg; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_PAPER' must be empty. */ lr_ignore_rest (ldfile, 1); @@ -179,7 +174,7 @@ paper_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_paper, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_paper, LC_PAPER, "LC_PAPER", ignore_content); return; } diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c index 1fd79fb516..19ba12d1bb 100644 --- a/locale/programs/ld-telephone.c +++ b/locale/programs/ld-telephone.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -223,16 +223,11 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, struct charmap_t *charmap, const char *repertoire_name, int ignore_content) { - struct repertoire_t *repertoire = NULL; struct locale_telephone_t *telephone; struct token *now; struct token *arg; enum token_t nowtok; - /* Get the repertoire we have to use. */ - if (repertoire_name != NULL) - repertoire = repertoire_read (repertoire_name); - /* The rest of the line containing `LC_TELEPHONE' must be free. */ lr_ignore_rest (ldfile, 1); @@ -246,7 +241,7 @@ telephone_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_telephone, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_telephone, LC_TELEPHONE, "LC_TELEPHONE", ignore_content); return; } diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 0d513964e9..2bed14f7b1 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -884,7 +884,7 @@ time_read (struct linereader *ldfile, struct localedef_t *result, /* If we see `copy' now we are almost done. */ if (nowtok == tok_copy) { - handle_copy (ldfile, charmap, repertoire, result, tok_lc_time, + handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_time, LC_TIME, "LC_TIME", ignore_content); return; } diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h index 50a1d7709d..ed843b6a29 100644 --- a/locale/programs/locfile.h +++ b/locale/programs/locfile.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -47,7 +47,7 @@ struct locale_file /* General handling of `copy'. */ static inline void handle_copy (struct linereader *ldfile, struct charmap_t *charmap, - struct repertoire_t *repertoire, struct localedef_t *result, + const char *repertoire_name, struct localedef_t *result, enum token_t token, int locale, const char *locale_name, int ignore_content) { @@ -65,7 +65,7 @@ locale name should consist only of portable characters")); else { (void) add_to_readlist (locale, now->val.str.startmb, - repertoire->name, 1); + repertoire_name, 1); result->copy_name[locale] = now->val.str.startmb; } } |