diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-11-21 06:51:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-11-21 06:51:06 +0000 |
| commit | a2236316645f0e4c3c9b286a7f908da786b9726f (patch) | |
| tree | 3e6f677872dc7e0301867333c0f0be193ff82146 /locale | |
| parent | 1ceb8afe3d8c3c9b1ca7a6f0d13ee762667f397d (diff) | |
| download | glibc-a2236316645f0e4c3c9b286a7f908da786b9726f.tar.gz glibc-a2236316645f0e4c3c9b286a7f908da786b9726f.tar.xz glibc-a2236316645f0e4c3c9b286a7f908da786b9726f.zip | |
Update.
* locale/programs/ld-monetary.c (monetary_finish): Don't print individual error message if nothing is defined.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-monetary.c | 5 | ||||
| -rw-r--r-- | locale/programs/ld-numeric.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index f1b527c79a..31846b11cf 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -216,7 +216,7 @@ monetary_finish (struct localedef_t *locale, struct charmap_t *charmap) { if (strlen (monetary->int_curr_symbol) != 4) { - if (!be_quiet) + if (! be_quiet && ! nothing) error (0, 0, _("\ %s: value of field `int_curr_symbol' has wrong length"), "LC_MONETARY"); @@ -250,7 +250,8 @@ not correspond to a valid name in ISO 4217"), if (monetary->cat == -2 && ! be_quiet && ! nothing) \ error (0, 0, _("%s: field `%s' not defined"), \ "LC_MONETARY", #cat); \ - else if ((monetary->cat < min || monetary->cat > max) && !be_quiet) \ + else if ((monetary->cat < min || monetary->cat > max) && !be_quiet \ + && !nothing) \ error (0, 0, _("\ %s: value for field `%s' must be in range %d...%d"), \ "LC_MONETARY", #cat, min, max) diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index 3bf198aba5..22943f30ee 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -116,8 +116,9 @@ numeric_finish (struct localedef_t *locale, struct charmap_t *charmap) != "". */ if (numeric->decimal_point == NULL) { - error (0, 0, _("%s: field `%s' not defined"), - "LC_NUMERIC", "decimal_point"); + if (! be_quiet && ! nothing) + 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) |