Clear error_message_count before parsing PO files.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 88846f5c6acf9e2cf8368a744b79115a0bad8e49..cdd621fd91e503640d824dc83f810658a4a39e49 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-23  Daiki Ueno  <ueno@gnu.org>
+
+       * read-catalog-abstract.c (catalog_reader_parse): Clear
+       error_message_count before parsing, rather than after.  The
+       variable may be > 0 before calling the PO parser, when xgettext
+       handles mutiple files.
+       Problem reported by Emil Wojak in
+       <https://lists.gnu.org/archive/html/bug-gettext/2013-10/msg00005.html>.
+
 2013-10-15  Peter Eisentraut  <peter_e@gmx.net>  (tiny change)
 
        * msgl-check.c (check_header_entry): Adjust the default value of

diff --git a/gettext-tools/src/read-catalog-abstract.c b/gettext-tools/src/read-catalog-abstract.c
index cb713dce3a8a5805ce9b01a4ea64031d0d68f5c5..d4e98ee20114c610b885f11b08c174796d40339b 100644 (file)
--- a/gettext-tools/src/read-catalog-abstract.c
+++ b/gettext-tools/src/read-catalog-abstract.c
@@ -171,6 +171,8 @@ catalog_reader_parse (abstract_catalog_reader_ty *pop, FILE *fp,
                       const char *real_filename, const char *logical_filename,
                       catalog_input_format_ty input_syntax)
 {
+  error_message_count = 0;
+
   /* Parse the stream's content.  */
   parse_start (pop);
   input_syntax->parse (pop, fp, real_filename, logical_filename);
@@ -183,7 +185,6 @@ catalog_reader_parse (abstract_catalog_reader_ty *pop, FILE *fp,
                                     "found %d fatal errors",
                                     error_message_count),
                           error_message_count));
-  error_message_count = 0;
 }