summaryrefslogtreecommitdiff
path: root/locale/programs/ld-paper.c
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs/ld-paper.c')
-rw-r--r--locale/programs/ld-paper.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 24ea684c40..6cbf4e990f 100644
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -19,7 +19,6 @@
# include <config.h>
#endif
-#include <error.h>
#include <langinfo.h>
#include <string.h>
#include <stdint.h>
@@ -87,9 +86,8 @@ paper_finish (struct localedef_t *locale, const struct charmap_t *charmap)
empty one. */
if (paper == NULL)
{
- if (! be_quiet)
- WITH_CUR_LOCALE (error (0, 0, _("\
-No definition for %s category found"), "LC_PAPER"));
+ record_warning (_("\
+No definition for %s category found"), "LC_PAPER");
paper_startup (NULL, locale, 0);
paper = locale->categories[LC_PAPER].paper;
nothing = 1;
@@ -99,8 +97,8 @@ No definition for %s category found"), "LC_PAPER"));
if (paper->height == 0)
{
if (! nothing)
- WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
- "LC_PAPER", "height"));
+ record_error (0, 0, _("%s: field `%s' not defined"),
+ "LC_PAPER", "height");
/* Use as default values the values from the i18n locale. */
paper->height = 297;
}
@@ -108,8 +106,8 @@ No definition for %s category found"), "LC_PAPER"));
if (paper->width == 0)
{
if (! nothing)
- WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
- "LC_PAPER", "width"));
+ record_error (0, 0, _("%s: field `%s' not defined"),
+ "LC_PAPER", "width");
/* Use as default values the values from the i18n locale. */
paper->width = 210;
}