From a235a58c7962c52b9978bdc7c0ab1f0bcb92995f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 2 Mar 1998 13:34:41 +0000 Subject: [PATCH] (parse_charmap): Don't skip error checking when being quiet. --- locale/programs/charmap.c | 7 ++++--- locale/programs/ld-messages.c | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index 37b6cdef968..9719ebc1e3a 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -171,11 +171,12 @@ parse_charmap (const char *filename) result->mb_cur_max = 1; if (result->mb_cur_min == 0) result->mb_cur_min = result->mb_cur_max; - if (result->mb_cur_min > result->mb_cur_max && !be_quiet) + if (result->mb_cur_min > result->mb_cur_max) { - error (0, 0, _("\ + if (!be_quiet) + error (0, 0, _("\ %s: must be greater than \n"), - cmfile->fname); + cmfile->fname); result->mb_cur_min = result->mb_cur_max; } diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c index a78a72907fe..0adf1514fd0 100644 --- a/locale/programs/ld-messages.c +++ b/locale/programs/ld-messages.c @@ -77,9 +77,12 @@ messages_finish (struct localedef_t *locale) = locale->categories[LC_MESSAGES].messages; /* The fields YESSTR and NOSTR are optional. */ - if (messages->yesexpr == NULL && !be_quiet) - error (0, 0, _("field `%s' in category `%s' undefined"), - "yesexpr", "LC_MESSAGES"); + if (messages->yesexpr == NULL) + { + if (!be_quiet) + error (0, 0, _("field `%s' in category `%s' undefined"), + "yesexpr", "LC_MESSAGES"); + } else { int result; @@ -98,9 +101,12 @@ no correct regular expression for field `%s' in category `%s': %s"), } } - if (messages->noexpr == NULL && !be_quiet) - error (0, 0, _("field `%s' in category `%s' undefined"), - "noexpr", "LC_MESSAGES"); + if (messages->noexpr == NULL) + { + if (!be_quiet) + error (0, 0, _("field `%s' in category `%s' undefined"), + "noexpr", "LC_MESSAGES"); + } else { int result; -- 2.47.2