summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libxslt/extensions.c2
-rw-r--r--tests/exslt/common/Makefile.am1
-rw-r--r--tests/exslt/common/node-set.9.out33
-rw-r--r--tests/exslt/common/node-set.9.xml42
-rw-r--r--tests/exslt/common/node-set.9.xsl7
6 files changed, 7 insertions, 84 deletions
diff --git a/ChangeLog b/ChangeLog
index 9474988b..826a79fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 16 01:24:58 HKT 2008 William Brack <wbrack@mmm.com.hk>
+
+ *libxslt/extensions.c: fixed minor error bug #516483
+ *tests/exslt/common - deleted node-set.9 regression test,
+ because it relied upon an external web import.
+
Tue Feb 5 08:53:30 CET 2008 Daniel Veillard <daniel@veillard.com>
* libxslt/xslt.c: applied documentation patch from Jason Viers
diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index 830444c8..42d8843f 100644
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -1951,7 +1951,7 @@ xsltExtInitTest(xsltTransformContextPtr ctxt, const xmlChar * URI)
xsltGenericDebug(xsltGenericErrorContext,
"xsltExtInitTest: not initialized,"
" calling xsltStyleGetExtData\n");
- xsltStyleGetExtData(ctxt->style, URI);
+ testStyleData = xsltStyleGetExtData(ctxt->style, URI);
if (testStyleData == NULL) {
xsltTransformError(ctxt, NULL, NULL,
"xsltExtInitTest: not initialized\n");
diff --git a/tests/exslt/common/Makefile.am b/tests/exslt/common/Makefile.am
index 5b6dcf0f..176ec77b 100644
--- a/tests/exslt/common/Makefile.am
+++ b/tests/exslt/common/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST = \
node-set.6.xml node-set.6.xsl node-set.6.out \
node-set.7.xml node-set.7.xsl node-set.7.out \
node-set.8.xml node-set.8.xsl node-set.8.out \
- node-set.9.xml node-set.8.xsl node-set.9.out \
object-type.1.xml object-type.1.xsl object-type.1.out \
import-test1a.imp import-test1b.imp import-test1.out \
import-test1.xml import-test1.xsl
diff --git a/tests/exslt/common/node-set.9.out b/tests/exslt/common/node-set.9.out
deleted file mode 100644
index 01530e2e..00000000
--- a/tests/exslt/common/node-set.9.out
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title></title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0" /></head><body><dt><a id="opt-memsize"></a><span class="term"><code class="option">-m</code> </span></dt><dd><p>Sets the amount of memory
-tries to grab on startup. The amount may be given as
-</p><div class="variablelist"><dl><dt><span class="term"><em class="replaceable"><code>nnnnnnn</code></em></span></dt><dd>measured in bytes
-</dd><dt><span class="term"><em class="replaceable"><code>nnnn</code></em><span><strong class="command">K</strong></span>, </span><span class="term"><em class="replaceable"><code>nnnn</code></em><span><strong class="command">KB</strong></span></span></dt><dd>measured in kilobytes
-</dd><dt><span class="term"><span><strong class="command">M</strong></span>, </span><span class="term"><span><strong class="command">MB</strong></span></span></dt><dd>measured in megabytes
-</dd></dl></div><p>
-The default is 3 megabytes.
-<!-- #if (oint_addr_len+addr_shift==24) -->
-The argument is constrained between 100 KB and 16 MB.
-<!-- #elif (oint_addr_len+addr_shift==26) -->
-The argument is constrained between 100 KB and 64 MB.
-<!-- #elif (oint_addr_len+addr_shift==28) -->
-The argument is constrained between 100 KB and 256 MB.
-<!-- #else -->
-The argument is constrained above 100 KB.
-<!-- #endif -->
-</p><p>This version of
-<!-- #if defined(SPVW_MIXED) && defined(SPVW_BLOCKS) -->
-<!-- #ifdef GENERATIONAL_GC -->
-is not likely to actually use the entire since ion will
-periodically reduce the amount of used memory.
-It is therefore common to specify 10 MB even if only 2 MB are going
-to be used.
-<!-- #else -->
-eventually uses the entire .
-<!-- #endif -->
-<!-- #else -->
-allocates memory dynamically. is essentially ignored
-(except that it determines the Lisp size).
-<!-- #endif -->
-</p></dd></body></html>
diff --git a/tests/exslt/common/node-set.9.xml b/tests/exslt/common/node-set.9.xml
deleted file mode 100644
index a17807dc..00000000
--- a/tests/exslt/common/node-set.9.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<varlistentry id="opt-memsize"><term><option>-m</option> </term>
-<listitem><para>Sets the amount of memory
-tries to grab on startup. The amount may be given as
-<variablelist>
-<varlistentry><term><replaceable>nnnnnnn</replaceable></term>
-<listitem><simpara>measured in bytes
-</simpara></listitem></varlistentry>
-<varlistentry>
-<term><replaceable>nnnn</replaceable><command>K</command></term>
-<term><replaceable>nnnn</replaceable><command>KB</command></term>
-<listitem><simpara>measured in kilobytes
-</simpara></listitem></varlistentry>
-<varlistentry>
-<term><command>M</command></term>
-<term><command>MB</command></term>
-<listitem><simpara>measured in megabytes
-</simpara></listitem></varlistentry></variablelist>
-The default is 3 megabytes.
-<!-- #if (oint_addr_len+addr_shift==24) -->
-The argument is constrained between 100 KB and 16 MB.
-<!-- #elif (oint_addr_len+addr_shift==26) -->
-The argument is constrained between 100 KB and 64 MB.
-<!-- #elif (oint_addr_len+addr_shift==28) -->
-The argument is constrained between 100 KB and 256 MB.
-<!-- #else -->
-The argument is constrained above 100 KB.
-<!-- #endif -->
-</para><simpara>This version of
-<!-- #if defined(SPVW_MIXED) && defined(SPVW_BLOCKS) -->
-<!-- #ifdef GENERATIONAL_GC -->
-is not likely to actually use the entire since ion will
-periodically reduce the amount of used memory.
-It is therefore common to specify 10 MB even if only 2 MB are going
-to be used.
-<!-- #else -->
-eventually uses the entire .
-<!-- #endif -->
-<!-- #else -->
-allocates memory dynamically. is essentially ignored
-(except that it determines the Lisp size).
-<!-- #endif -->
-</simpara></listitem></varlistentry>
diff --git a/tests/exslt/common/node-set.9.xsl b/tests/exslt/common/node-set.9.xsl
deleted file mode 100644
index 0df6590d..00000000
--- a/tests/exslt/common/node-set.9.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:import
-href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-<xsl:template match="comment()"> <!-- pass through comments -->
- <xsl:comment><xsl:value-of select="."/></xsl:comment>
-</xsl:template>
-</xsl:stylesheet>