From: Bruno Haible <bruno@clisp.org>
Date: Mon, 8 Apr 2024 15:04:45 +0000 (+0200)
Subject: Fix -Wdiscarded-qualifiers warnings caused by a newer libxml2.
X-Git-Tag: v0.23~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6456980949f3766b366d3a7afba05d7fefe27cd0;p=thirdparty%2Fgettext.git

Fix -Wdiscarded-qualifiers warnings caused by a newer libxml2.

Reported by Manish Tiwari <matiwari@redhat.com> in
<https://lists.gnu.org/archive/html/bug-gettext/2024-04/msg00001.html>.

* gettext-tools/src/format-kde-kuit.c (format_parse): Declare the local variable
err as 'const xmlError *'.
* gettext-tools/src/its.c (its_rule_list_add_from_file,
its_rule_list_add_from_string, its_rule_list_extract, its_merge_context_alloc):
Likewise.
* gettext-tools/src/locating-rule.c (locating_rule_match): Likewise.
---

diff --git a/gettext-tools/src/format-kde-kuit.c b/gettext-tools/src/format-kde-kuit.c
index 77add0ceb..514bb2f4b 100644
--- a/gettext-tools/src/format-kde-kuit.c
+++ b/gettext-tools/src/format-kde-kuit.c
@@ -1,5 +1,5 @@
 /* KUIT (KDE User Interface Text) format strings.
-   Copyright (C) 2015-2023 Free Software Foundation, Inc.
+   Copyright (C) 2015-2024 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
    This program is free software: you can redistribute it and/or modify
@@ -239,7 +239,7 @@ format_parse (const char *format, bool translated, char *fdi,
                            | XML_PARSE_NOBLANKS);
       if (doc == NULL)
         {
-          xmlError *err = xmlGetLastError ();
+          const xmlError *err = xmlGetLastError ();
           *invalid_reason =
             xasprintf (_("error while parsing: %s"),
                        err->message);
diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
index 368512173..befe8b691 100644
--- a/gettext-tools/src/its.c
+++ b/gettext-tools/src/its.c
@@ -1460,7 +1460,7 @@ its_rule_list_add_from_file (struct its_rule_list_ty *rules,
                      | XML_PARSE_NOERROR);
   if (doc == NULL)
     {
-      xmlError *err = xmlGetLastError ();
+      const xmlError *err = xmlGetLastError ();
       error (0, 0, _("cannot read %s: %s"), filename, err->message);
       return false;
     }
@@ -1486,7 +1486,7 @@ its_rule_list_add_from_string (struct its_rule_list_ty *rules,
                        | XML_PARSE_NOERROR);
   if (doc == NULL)
     {
-      xmlError *err = xmlGetLastError ();
+      const xmlError *err = xmlGetLastError ();
       error (0, 0, _("cannot read %s: %s"), "(internal)", err->message);
       return false;
     }
@@ -1883,7 +1883,7 @@ its_rule_list_extract (its_rule_list_ty *rules,
                    | XML_PARSE_NOERROR);
   if (doc == NULL)
     {
-      xmlError *err = xmlGetLastError ();
+      const xmlError *err = xmlGetLastError ();
       error (0, 0, _("cannot read %s: %s"), logical_filename, err->message);
       return;
     }
@@ -2004,7 +2004,7 @@ its_merge_context_alloc (its_rule_list_ty *rules,
                      | XML_PARSE_NOERROR);
   if (doc == NULL)
     {
-      xmlError *err = xmlGetLastError ();
+      const xmlError *err = xmlGetLastError ();
       error (0, 0, _("cannot read %s: %s"), filename, err->message);
       return NULL;
     }
diff --git a/gettext-tools/src/locating-rule.c b/gettext-tools/src/locating-rule.c
index 2ed5c48cf..672bf7d07 100644
--- a/gettext-tools/src/locating-rule.c
+++ b/gettext-tools/src/locating-rule.c
@@ -178,7 +178,7 @@ locating_rule_match (struct locating_rule_ty *rule,
                          | XML_PARSE_NOERROR);
       if (doc == NULL)
         {
-          xmlError *err = xmlGetLastError ();
+          const xmlError *err = xmlGetLastError ();
           error (0, 0, _("cannot read %s: %s"), filename, err->message);
           return NULL;
         }