aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/ld-paper.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-05 23:29:24 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-05 23:29:24 +0000
commitf2b98f97ebc32b68271505131b745289f3255984 (patch)
treec0b00f281985b708c6b991648a05be6752f96868 /locale/programs/ld-paper.c
parent475361200b40615d2d459c8d6a7544fdf4f9533a (diff)
downloadglibc-f2b98f97ebc32b68271505131b745289f3255984.tar
glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.gz
glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.bz2
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/ld-paper.c')
-rw-r--r--locale/programs/ld-paper.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 334d405ca8..2dce9ca8da 100644
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.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.
@@ -28,6 +28,7 @@
#include <assert.h>
+#include "localedef.h"
#include "localeinfo.h"
#include "locfile.h"
@@ -88,7 +89,8 @@ paper_finish (struct localedef_t *locale, const struct charmap_t *charmap)
if (paper == NULL)
{
if (! be_quiet)
- error (0, 0, _("No definition for %s category found"), "LC_PAPER");
+ WITH_CUR_LOCALE (error (0, 0, _("\
+No definition for %s category found"), "LC_PAPER"));
paper_startup (NULL, locale, 0);
paper = locale->categories[LC_PAPER].paper;
nothing = 1;
@@ -98,7 +100,8 @@ paper_finish (struct localedef_t *locale, const struct charmap_t *charmap)
if (paper->height == 0)
{
if (! nothing)
- error (0, 0, _("%s: field `%s' not defined"), "LC_PAPER", "height");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_PAPER", "height"));
/* Use as default values the values from the i18n locale. */
paper->height = 297;
}
@@ -106,7 +109,8 @@ paper_finish (struct localedef_t *locale, const struct charmap_t *charmap)
if (paper->width == 0)
{
if (! nothing)
- error (0, 0, _("%s: field `%s' not defined"), "LC_PAPER", "width");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_PAPER", "width"));
/* Use as default values the values from the i18n locale. */
paper->width = 210;
}