about summary refs log tree commit diff
path: root/locale/programs/ld-paper.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-17 01:57:24 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-17 01:57:24 +0000
commit01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c (patch)
tree243b88d6969609e40850e4c0f04f49e08f21d835 /locale/programs/ld-paper.c
parenta8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e (diff)
downloadglibc-01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c.tar.gz
glibc-01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c.tar.xz
glibc-01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c.zip
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-paper.c')
-rw-r--r--locale/programs/ld-paper.c9
1 files changed, 2 insertions, 7 deletions
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;
     }