From a083b0b03e26ab057b6cca3e44ac9ea11a4b19d9 Mon Sep 17 00:00:00 2001 From: "William M. Brack" Date: Sun, 2 Nov 2003 01:10:43 +0000 Subject: [PATCH] fixed bug #125502 and corrected expected test output fixed broken test * libxslt/transform.c, tests/general/bug-119.out: fixed bug #125502 and corrected expected test output * tests/general/bug-79.out: fixed broken test (bug #123328) * libxslt/pattern.c, libexslt/functions.c: minor change to eliminate compilation warning --- ChangeLog | 8 ++++++++ libexslt/functions.c | 6 +++--- libxslt/pattern.c | 2 +- libxslt/transform.c | 12 ------------ tests/general/bug-119.out | 2 -- tests/general/bug-79.out | 2 +- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdcad43..4c72270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Nov 1 17:04:27 PST 2003 William Brack + + * libxslt/transform.c, tests/general/bug-119.out: fixed + bug #125502 and corrected expected test output + * tests/general/bug-79.out: fixed broken test (bug #123328) + * libxslt/pattern.c, libexslt/functions.c: minor change to + eliminate compilation warning + Sat Nov 1 22:36:30 CET 2003 Daniel Veillard * tests/REC/test-5.2-17.xsl tests/REC/test-5.2-18.xsl: fixing two diff --git a/libexslt/functions.c b/libexslt/functions.c index efff43f..efa6713 100644 --- a/libexslt/functions.c +++ b/libexslt/functions.c @@ -184,13 +184,13 @@ exsltFuncShutdown (xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED, * @style: an XSLT stylesheet * @URI: the namespace URI for the extension * - * Allocates the styleshet data for EXSLT - Function + * Allocates the stylesheet data for EXSLT - Function * * Returns the allocated data */ static xmlHashTablePtr -exsltFuncStyleInit (xsltStylesheetPtr style, - const xmlChar *URI) { +exsltFuncStyleInit (xsltStylesheetPtr style ATTRIBUTE_UNUSED, + const xmlChar *URI ATTRIBUTE_UNUSED) { return xmlHashCreate(1); } diff --git a/libxslt/pattern.c b/libxslt/pattern.c index fa518da..e7d4a51 100644 --- a/libxslt/pattern.c +++ b/libxslt/pattern.c @@ -199,7 +199,7 @@ xsltFreeCompMatchList(xsltCompMatchPtr comp) { * steps of an imported stylesheet. */ void xsltNormalizeCompSteps(void *payload, - void *data, const xmlChar *name) { + void *data, const xmlChar *name ATTRIBUTE_UNUSED) { xsltCompMatchPtr comp = payload; xsltStylesheetPtr style = data; int ix; diff --git a/libxslt/transform.c b/libxslt/transform.c index df673a9..5d865bf 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -1068,7 +1068,6 @@ static void xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, xsltStackElemPtr params) { xmlNodePtr copy; - xmlAttrPtr attrs; xmlNodePtr delete = NULL, cur; int nbchild = 0, oldSize; int childno = 0, oldPos; @@ -1192,17 +1191,6 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, /* * Handling of Elements: second pass, actual processing */ - if (node->type == XML_ELEMENT_NODE) { - attrs = node->properties; - while (attrs != NULL) { - template = xsltGetTemplate(ctxt, (xmlNodePtr) attrs, NULL); - if (template) { - xsltApplyOneTemplate(ctxt, (xmlNodePtr) attrs, - template->content, template, params); - } - attrs = attrs->next; - } - } oldSize = ctxt->xpathCtxt->contextSize; oldPos = ctxt->xpathCtxt->proximityPosition; cur = node->children; diff --git a/tests/general/bug-119.out b/tests/general/bug-119.out index dd5283e..2e23c01 100644 --- a/tests/general/bug-119.out +++ b/tests/general/bug-119.out @@ -1,12 +1,10 @@ - NAME match - NAME match NAME diff --git a/tests/general/bug-79.out b/tests/general/bug-79.out index 0ef4698..1865eb8 100644 --- a/tests/general/bug-79.out +++ b/tests/general/bug-79.out @@ -1,5 +1,5 @@ -SUCCESS + -- 2.7.4