diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-02-05 23:29:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-02-05 23:29:24 +0000 |
| commit | f2b98f97ebc32b68271505131b745289f3255984 (patch) | |
| tree | c0b00f281985b708c6b991648a05be6752f96868 /locale/programs/repertoire.c | |
| parent | 475361200b40615d2d459c8d6a7544fdf4f9533a (diff) | |
| download | glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.gz glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.xz glibc-f2b98f97ebc32b68271505131b745289f3255984.zip | |
Update.
* inet/getnetgrent_r.c (innetgr): Add int* parameter to getfct definition and pass &errno in use of this variable. Reported by Simon Wilkinson <simon@sxw.org.uk> [PR libc/2911]. 2002-02-04 Andreas Schwab <schwab@suse.de> * locale/programs/localedef.h (WITH_CUR_LOCALE): Define. * locale/programs/charmap-dir.c: Wrap calls that output messages with WITH_CUR_LOCALE. Include "localedef.h" first. * locale/programs/charmap.c: Likewise. * locale/programs/ld-address.c: Likewise. * locale/programs/ld-collate.c: Likewise. * 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/linereader.c: Likewise. * locale/programs/linereader.h: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. 2002-02-05 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'locale/programs/repertoire.c')
| -rw-r--r-- | locale/programs/repertoire.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c index 903b620216..8251db43d3 100644 --- a/locale/programs/repertoire.c +++ b/locale/programs/repertoire.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -30,11 +30,11 @@ #include <string.h> #include <unistd.h> +#include "localedef.h" #include "linereader.h" #include "charmap.h" #include "repertoire.h" #include "simple-hash.h" -#include "localedef.h" /* Simple keyword hashing for the repertoiremap. */ @@ -322,13 +322,14 @@ argument to <%s> must be a single character"), } if (state != 2 && state != 90 && !be_quiet) - error (0, 0, _("%s: premature end of file"), repfile->fname); + WITH_CUR_LOCALE (error (0, 0, _("%s: premature end of file"), + repfile->fname)); lr_close (repfile); if (tsearch (result, &known, &repertoire_compare) == NULL) /* Something went wrong. */ - error (0, errno, _("cannot safe new repertoire map")); + WITH_CUR_LOCALE (error (0, errno, _("cannot safe new repertoire map"))); return result; } @@ -339,7 +340,8 @@ repertoire_complain (const char *name) { if (tfind (name, &unavailable, (__compar_fn_t) strcmp) == NULL) { - error (0, errno, _("repertoire map file `%s' not found"), name); + WITH_CUR_LOCALE (error (0, errno, _("\ +repertoire map file `%s' not found"), name)); /* Remember that we reported this map. */ tsearch (name, &unavailable, (__compar_fn_t) strcmp); |