summaryrefslogtreecommitdiff
path: root/locale/programs/ld-measurement.c
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs/ld-measurement.c')
-rw-r--r--locale/programs/ld-measurement.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c
index c4f98111e3..4d76c716f4 100644
--- a/locale/programs/ld-measurement.c
+++ b/locale/programs/ld-measurement.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>
@@ -90,9 +89,8 @@ measurement_finish (struct localedef_t *locale,
empty one. */
if (measurement == NULL)
{
- if (! be_quiet)
- WITH_CUR_LOCALE (error (0, 0, _("\
-No definition for %s category found"), "LC_MEASUREMENT"));
+ record_warning (_("\
+No definition for %s category found"), "LC_MEASUREMENT");
measurement_startup (NULL, locale, 0);
measurement = locale->categories[LC_MEASUREMENT].measurement;
nothing = 1;
@@ -102,16 +100,16 @@ No definition for %s category found"), "LC_MEASUREMENT"));
if (measurement->measurement == 0)
{
if (! nothing)
- WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
- "LC_MEASUREMENT", "measurement"));
+ record_error (0, 0, _("%s: field `%s' not defined"),
+ "LC_MEASUREMENT", "measurement");
/* Use as the default value the value of the i18n locale. */
measurement->measurement = 1;
}
else
{
if (measurement->measurement > 3)
- WITH_CUR_LOCALE (error (0, 0, _("%s: invalid value for field `%s'"),
- "LC_MEASUREMENT", "measurement"));
+ record_error (0, 0, _("%s: invalid value for field `%s'"),
+ "LC_MEASUREMENT", "measurement");
}
}