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 11ca073fe1bc5bc50661bb7f2508aef1d90071da..a8e070e7e14c19caad713fad839360fac528692d 100644 (file)
--- 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 7c6992b9702f151eb71aeea2e75e052f25a1b8c6..3e006976c28944836c54c9b9d28f4c8a4b8f0b7e 100644 (file)
--- 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)