From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 20 Mar 2015 01:36:27 +0000 (+0900)
Subject: kde-kuit: Use xmlns to avoid element name conflict
X-Git-Tag: v0.19.5~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf97aa79451a316f221fe752b2b1eedeef4d4453;p=thirdparty%2Fgettext.git

kde-kuit: Use xmlns to avoid element name conflict

* format-kde-kuit.c (XML_NS): New macro.
(format_parse): Add namespace qualifier to the <kuit> tag.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 11ca073fe..a8e070e7e 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-20  Daiki Ueno  <ueno@gnu.org>
+
+	kde-kuit: Use xmlns to avoid element name conflict
+	* format-kde-kuit.c (XML_NS): New macro.
+	(format_parse): Add namespace qualifier to the <kuit> tag.
+
 2015-03-12  Daiki Ueno  <ueno@gnu.org>
 
 	* format-kde-kuit.c (format_parse): Remove dead assignment,
diff --git a/gettext-tools/src/format-kde-kuit.c b/gettext-tools/src/format-kde-kuit.c
index 7c6992b97..3e006976c 100644
--- a/gettext-tools/src/format-kde-kuit.c
+++ b/gettext-tools/src/format-kde-kuit.c
@@ -50,6 +50,8 @@ struct spec
 
 #if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT
 
+#define XML_NS "https://www.gnu.org/s/gettext/kde"
+
 /* Callback called when <element> is seen.  */
 static void
 start_element_handler (void *data, const char *name,
@@ -209,11 +211,14 @@ format_parse (const char *format, bool translated, char *fdi,
           str = amp + 1;
         }
 
-      buffer = xmalloc (amp_count * 4 + strlen (format) + 16);
+      buffer = xmalloc (amp_count * 4
+                        + strlen (format)
+                        + strlen ("<gt:kuit xmlns:gt=\"" XML_NS "\"></gt:kuit>")
+                        + 1);
       *buffer = '\0';
 
       bp = buffer;
-      bp = stpcpy (bp, "<kuit>");
+      bp = stpcpy (bp, "<gt:kuit xmlns:gt=\"" XML_NS "\">");
       str = format;
       while (str < str_limit)
         {
@@ -226,7 +231,7 @@ format_parse (const char *format, bool translated, char *fdi,
           bp = stpcpy (bp, is_reference (amp) ? "&" : "&amp;");
           str = amp + 1;
         }
-      stpcpy (bp, "</kuit>");
+      stpcpy (bp, "</gt:kuit>");
 
       parser = XML_ParserCreate (NULL);
       if (parser == NULL)