[xml/sgml-commit] r837 - in /packages/libxslt: ./ trunk/debian/changelog trunk/libxslt/xslt.c

[glandium at users.alioth.debian.org]

Author: glandium
Date: Thu Jul 26 21:01:28 2007
New Revision: 837

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=837
Log:
 r1282 at namakemono:  mh | 2007-07-26 22:09:06 +0200
 * libxslt/xslt.c: Removed the exclude-result-prefix change breaking
   transformations. This reversal has also been done upstream.
   Closes: #434300.

Modified:
    packages/libxslt/   (props changed)
    packages/libxslt/trunk/debian/changelog
    packages/libxslt/trunk/libxslt/xslt.c

Propchange: packages/libxslt/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jul 26 21:01:28 2007
@@ -1,2 +1,2 @@
 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1278
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1282

Modified: packages/libxslt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/trunk/debian/changelog?rev=837&op=diff
==============================================================================
--- packages/libxslt/trunk/debian/changelog (original)
+++ packages/libxslt/trunk/debian/changelog Thu Jul 26 21:01:28 2007
@@ -1,3 +1,11 @@
+libxslt (1.1.21-2) unstable; urgency=low
+
+  * libxslt/xslt.c: Removed the exclude-result-prefix change breaking
+    transformations. This reversal has also been done upstream.
+    Closes: #434300.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 26 Jul 2007 22:05:48 +0200
+
 libxslt (1.1.21-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/libxslt/trunk/libxslt/xslt.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/trunk/libxslt/xslt.c?rev=837&op=diff
==============================================================================
--- packages/libxslt/trunk/libxslt/xslt.c (original)
+++ packages/libxslt/trunk/libxslt/xslt.c Thu Jul 26 21:01:28 2007
@@ -3469,7 +3469,7 @@
 	    }
 	    	     
 	    if ((cur->nsDef != NULL) && (style->exclPrefixNr > 0)) {
-		xmlNsPtr ns = cur->nsDef, prev = NULL, next, rns;
+		xmlNsPtr ns = cur->nsDef, prev = NULL, next;
 		xmlNodePtr root = NULL;
 		int i, moved;
 
@@ -3482,27 +3482,18 @@
 			    if ((ns->prefix != NULL) && 
 			        (xmlStrEqual(ns->href,
 					     style->exclPrefixTab[i]))) {
-				/* Remove the namespace from this node */
+				/*
+				 * Move the namespace definition on the root
+				 * element to avoid duplicating it without
+				 * loosing it.
+				 */
 				if (prev == NULL) {
 				    cur->nsDef = ns->next;
 				} else {
 				    prev->next = ns->next;
 				}
-				/*
-				 * If this prefix is not already present,
-				 * move the namespace definition on the root
-				 * element to avoid duplicating it without
-				 * loosing it.
-				 */
-				for (rns = root->nsDef; rns != NULL; rns = rns->next)
-				    if (xmlStrEqual(ns->prefix, rns->prefix))
-					break;
-				if (rns == NULL) {
-				    ns->next = root->nsDef;
-				    root->nsDef = ns;
-				}
-				else
-				    xmlFreeNs(ns);
+				ns->next = root->nsDef;
+				root->nsDef = ns;
 				moved = 1;
 				break;
 			    }