(parse_charmap): Don't skip error checking when being quiet.

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 37b6cdef96816955dd234d64f19225f947cf4eaf..9719ebc1e3a68332b6dd90b7c0f13e75ae75a879 100644 (file)
--- 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: <mb_cur_max> must be greater than <mb_cur_min>\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 a78a72907fe5ed0d3da517fdb4f5fb3ce40181c5..0adf1514fd0d65f4f0aa5a9d1a2f157057c1af4c 100644 (file)
--- 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;