From 01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 17 Jan 2000 01:57:24 +0000 Subject: Update. 2000-01-16 Ulrich Drepper * 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. --- locale/programs/ld-measurement.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'locale/programs/ld-measurement.c') 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 , 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; } -- cgit 1.4.1