From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 10 Dec 2014 03:10:16 +0000 (+0900)
Subject: msgfmt: Suppress compiler warning
X-Git-Tag: v0.19.4~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa7abb1366c78b76030d2f48cd371fa20854a9f8;p=thirdparty%2Fgettext.git

msgfmt: Suppress compiler warning

* msgl-check.c (check_header_entry): Don't declare unused variable
'nrequiredfields'.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index cb8e1101c..02cbf9183 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10  Daiki Ueno  <ueno@gnu.org>
+
+	* msgl-check.c (check_header_entry): Don't declare unused variable
+	'nrequiredfields'.
+
 2014-12-09  Daiki Ueno  <ueno@gnu.org>
 
 	* xgettext.c (arglist_parser_done): Avoid potential
diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c
index 64a68f61a..d6f4a3dcc 100644
--- a/gettext-tools/src/msgl-check.c
+++ b/gettext-tools/src/msgl-check.c
@@ -771,17 +771,17 @@ check_header_entry (const message_ty *mp, const char *msgstr_string)
     ""
   };
   const size_t nfields = SIZEOF (required_fields);
+  /* FIXME: We could check if a required header field is missing and
+     report it as error.  However, it's could be too rigorous and
+     break backward compatibility.  */
+#if 0
   const size_t nrequiredfields = nfields - 1;
+#endif
   int seen_errors = 0;
   int cnt;
 
   for (cnt = 0; cnt < nfields; ++cnt)
     {
-      /* 0.19 change: It would better report error if a required
-         header field is missing.  However, traditionally we didn't
-         treat it as error.  Let's wait for one or two cycles until we
-         can assume the required header fields are always
-         available in practical PO files.  */
 #if 0
       int severity =
         (cnt < nrequiredfields ? PO_SEVERITY_ERROR : PO_SEVERITY_WARNING);