cvs: php4 /ext/xslt sablot.c

sterling Sat Apr 20 20:27:04 2002 EDT Modified files: /php4/ext/xslt sablot.c Log: some more fixes towards making it work again Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.44 php4/ext/xslt/sablot.c:1.45 --- php4/ext/xslt/sablot.c:1.44 Fri Apr 19 19:46:08 2002 +++ php4/ext/xslt/sablot.c Sat Apr 20 20:27:04 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.44 2002/04/19 23:46:08 sterling Exp $ */ +/* $Id: sablot.c,v 1.45 2002/04/21 00:27:04 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -194,7 +194,7 @@ XSLT_CONTEXT(handle) = ctx; /* Allocate the actual processor itself, via sablotron */ - error = SablotCreateProcessor(&processor); + error = SablotCreateProcessorForSituation(XSLT_CONTEXT(handle), &processor); if (error) { XSLT_ERRNO(handle) = error; RETURN_FALSE; @@ -480,7 +480,7 @@ /* {{{ S_DOM *_php_sablot_dom_proc(php_xslt *, char *, size_t, zval **) */ static SDOM_Document -_php_sablot_dom_proc(php_xslt *h, char *datap, size_t data_len, zval **args) +_php_sablot_dom_proc(php_xslt *handle, char *datap, size_t data_len, zval **args) { SDOM_Document domtree; @@ -499,10 +499,10 @@ return NULL; } - SablotParseBuffer(XSLT_CONTEXT(h), Z_STRVAL_PP(data), &domtree); + SablotParseBuffer(XSLT_CONTEXT(handle), Z_STRVAL_PP(data), &domtree); } else { - SablotParse(XSLT_CONTEXT(h), datap, &domtree); + SablotParse(XSLT_CONTEXT(handle), datap, &domtree); } return domtree; @@ -558,7 +558,7 @@ RETURN_FALSE; } - SablotAddArgTree(handle->processor.ctx, + SablotAddArgTree(XSLT_CONTEXT(handle), XSLT_PROCESSOR(handle), "xml", xml_dom);