[xml/sgml-commit] r687 - in packages/libxslt: . trunk/debian trunk/xsltproc

[Mike Hommey]

Author: glandium
Date: 2007-04-08 14:32:53 +0000 (Sun, 08 Apr 2007)
New Revision: 687

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/xsltproc/xsltproc.c
Log:
 r1240 at namakemono:  mh | 2007-01-11 22:40:59 +0100
 * xsltproc/xsltproc.c: Apply patch for #356486 as applied upstream.



Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1217
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1240

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2007-03-26 02:12:56 UTC (rev 686)
+++ packages/libxslt/trunk/debian/changelog	2007-04-08 14:32:53 UTC (rev 687)
@@ -1,3 +1,9 @@
+libxslt (1.1.19-2) unstable; urgency=low
+
+  * xsltproc/xsltproc.c: Apply patch for #356486 as applied upstream.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 11 Jan 2007 22:38:15 +0100
+
 libxslt (1.1.19-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/libxslt/trunk/xsltproc/xsltproc.c
===================================================================
--- packages/libxslt/trunk/xsltproc/xsltproc.c	2007-03-26 02:12:56 UTC (rev 686)
+++ packages/libxslt/trunk/xsltproc/xsltproc.c	2007-04-08 14:32:53 UTC (rev 687)
@@ -354,7 +354,6 @@
 xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) {
     xmlDocPtr res;
     xsltTransformContextPtr ctxt;
-    int ret;
    
 
 #ifdef LIBXML_XINCLUDE_ENABLED
@@ -457,7 +456,7 @@
 
 	xmlFreeDoc(res);
     } else {
-
+        int ret;
 	ctxt = xsltNewTransformContext(cur, doc);
 	if (ctxt == NULL)
 	    return;
@@ -470,7 +469,7 @@
 	}
 	if (ret == -1)
 	    errorno = 11;
-	if (ctxt->state == XSLT_STATE_ERROR)
+	else if (ctxt->state == XSLT_STATE_ERROR)
 	    errorno = 9;
 	else if (ctxt->state == XSLT_STATE_STOPPED)
 	    errorno = 10;