From: Bruno Haible <bruno@clisp.org>
Date: Wed, 3 Oct 2018 22:58:24 +0000 (+0200)
Subject: msgfmt: Remove outdated warning.
X-Git-Tag: v0.20~366
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=191ba77b644234a28f93485e6be2bd5deef51d91;p=thirdparty%2Fgettext.git

msgfmt: Remove outdated warning.

* gettext-tools/src/msgfmt.c (msgfmt_parse_debrief): Remove outdated warning.
(struct msgfmt_catalog_reader_ty): Remove field 'has_nonfuzzy_header_entry'.
(msgfmt_constructor, msgfmt_frob_new_message): Update.
---

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index adab4a41f..d8221952b 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -1153,7 +1153,6 @@ struct msgfmt_catalog_reader_ty
   DEFAULT_CATALOG_READER_TY
 
   bool has_header_entry;
-  bool has_nonfuzzy_header_entry;
 };
 
 
@@ -1167,7 +1166,6 @@ msgfmt_constructor (abstract_catalog_reader_ty *that)
   default_constructor (that);
 
   this->has_header_entry = false;
-  this->has_nonfuzzy_header_entry = false;
 }
 
 
@@ -1192,18 +1190,6 @@ warning: PO file header missing or invalid\n")));
                            xasprintf (_("\
 warning: charset conversion will not work\n")));
         }
-      else if (!this->has_nonfuzzy_header_entry)
-        {
-          /* Has only a fuzzy header entry.  Since the versions 0.10.xx
-             ignore a fuzzy header entry and even give an error on it, we
-             give a warning, to increase operability with these older
-             msgfmt versions.  This warning can go away in January 2003.  */
-          multiline_warning (xasprintf ("%s: ", this->file_name),
-                             xasprintf (_("warning: PO file header fuzzy\n")));
-          multiline_warning (NULL,
-                             xasprintf (_("\
-warning: older versions of msgfmt will give an error on this\n")));
-        }
     }
 }
 
@@ -1323,8 +1309,6 @@ msgfmt_frob_new_message (default_catalog_reader_ty *that, message_ty *mp,
           if (is_header (mp))
             {
               this->has_header_entry = true;
-              if (!mp->is_fuzzy)
-                this->has_nonfuzzy_header_entry = true;
             }
           else
             /* We don't count the header entry in the statistic so place