diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-01-17 01:57:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-17 01:57:24 +0000 |
| commit | 01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c (patch) | |
| tree | 243b88d6969609e40850e4c0f04f49e08f21d835 /locale/programs/ld-name.c | |
| parent | a8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e (diff) | |
| download | glibc-01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c.tar.gz | |
Update.
2000-01-16 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/locfile.h (handle_copy): Take repertoire map
name as parameter, not pointer to repertoire structure.
* locale/programs/ld-address.c: Change caller.
* 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.
Diffstat (limited to 'locale/programs/ld-name.c')
| -rw-r--r-- | locale/programs/ld-name.c | 11 |
1 files changed, 3 insertions, 8 deletions
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; } |