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/ld-numeric.c | |
| parent | 475361200b40615d2d459c8d6a7544fdf4f9533a (diff) | |
| download | glibc-f2b98f97ebc32b68271505131b745289f3255984.zip glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.gz glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.bz2 | |
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/ld-numeric.c')
| -rw-r--r-- | locale/programs/ld-numeric.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index c0be827..6e385f2 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -27,8 +27,8 @@ #include <assert.h> -#include "linereader.h" #include "localedef.h" +#include "linereader.h" #include "localeinfo.h" #include "locfile.h" @@ -96,8 +96,8 @@ numeric_finish (struct localedef_t *locale, const struct charmap_t *charmap) if (numeric == NULL) { if (! be_quiet) - error (0, 0, _("No definition for %s category found"), - "LC_NUMERIC"); + WITH_CUR_LOCALE (error (0, 0, _("\ +No definition for %s category found"), "LC_NUMERIC")); numeric_startup (NULL, locale, 0); numeric = locale->categories[LC_NUMERIC].numeric; nothing = 1; @@ -110,21 +110,22 @@ numeric_finish (struct localedef_t *locale, const struct charmap_t *charmap) if (numeric->decimal_point == NULL) { if (! be_quiet && ! nothing) - error (0, 0, _("%s: field `%s' not defined"), - "LC_NUMERIC", "decimal_point"); + WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), + "LC_NUMERIC", "decimal_point")); numeric->decimal_point = "."; } else if (numeric->decimal_point[0] == '\0' && ! be_quiet && ! nothing) { - error (0, 0, _("\ + WITH_CUR_LOCALE (error (0, 0, _("\ %s: value for field `%s' must not be the empty string"), - "LC_NUMERIC", "decimal_point"); + "LC_NUMERIC", "decimal_point")); } if (numeric->decimal_point_wc == L'\0') numeric->decimal_point_wc = L'.'; if (numeric->grouping_len == 0 && ! be_quiet && ! nothing) - error (0, 0, _("%s: field `%s' not defined"), "LC_NUMERIC", "grouping"); + WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), + "LC_NUMERIC", "grouping")); } |