chregu Mon Jan 17 11:01:38 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xsl php_xsl.c php_xsl.h xsltprocessor.c
Log:
MFH
proto fixes
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.22.2.4&r2=1.22.2.5&ty=u
Index: php-src/ext/xsl/php_xsl.c
diff -u php-src/ext/xsl/php_xsl.c:1.22.2.4 php-src/ext/xsl/php_xsl.c:1.22.2.5
--- php-src/ext/xsl/php_xsl.c:1.22.2.4 Wed Sep 8 12:54:53 2004
+++ php-src/ext/xsl/php_xsl.c Mon Jan 17 11:01:35 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.22.2.4 2004/09/08 16:54:53 rrichards Exp $ */
+/* $Id: php_xsl.c,v 1.22.2.5 2005/01/17 16:01:35 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -83,6 +83,11 @@
FREE_HASHTABLE(intern->node_list);
}
+ if (intern->doc) {
+ php_libxml_decrement_doc_ref(intern->doc TSRMLS_CC);
+ efree(intern->doc);
+ }
+
if (intern->ptr) {
/* free wrapper */
if (((xsltStylesheetPtr) intern->ptr)->_private != NULL) {
@@ -112,6 +117,7 @@
intern->hasKeys = 0;
intern->registerPhpFunctions = 0;
intern->node_list = NULL;
+ intern->doc = NULL;
ALLOC_HASHTABLE(intern->std.properties);
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.h?r1=1.10.2.2&r2=1.10.2.3&ty=u
Index: php-src/ext/xsl/php_xsl.h
diff -u php-src/ext/xsl/php_xsl.h:1.10.2.2 php-src/ext/xsl/php_xsl.h:1.10.2.3
--- php-src/ext/xsl/php_xsl.h:1.10.2.2 Wed Sep 8 12:54:53 2004
+++ php-src/ext/xsl/php_xsl.h Mon Jan 17 11:01:35 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.h,v 1.10.2.2 2004/09/08 16:54:53 rrichards Exp $ */
+/* $Id: php_xsl.h,v 1.10.2.3 2005/01/17 16:01:35 chregu Exp $ */
#ifndef PHP_XSL_H
#define PHP_XSL_H
@@ -58,6 +58,7 @@
int hasKeys;
int registerPhpFunctions;
HashTable *node_list;
+ php_libxml_node_object *doc;
} xsl_object;
void php_xsl_set_object(zval *wrapper, void *obj TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.4&r2=1.29.2.5&ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.4
php-src/ext/xsl/xsltprocessor.c:1.29.2.5
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.4 Wed Sep 8 12:54:53 2004
+++ php-src/ext/xsl/xsltprocessor.c Mon Jan 17 11:01:35 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.29.2.4 2004/09/08 16:54:53 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.5 2005/01/17 16:01:35 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -324,7 +324,7 @@
}
-/* {{{ proto xsl_xsltdocucument xsl_xsltprocessor_import_stylesheet(node
index);
+/* {{{ proto void xsl_xsltprocessor_import_stylesheet(domdocument doc);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
Since:
*/
@@ -457,7 +457,7 @@
}
-/* {{{ proto xsl_document xsl_xsltprocessor_transform_to_doc(node doc
[,boolean clone]);
+/* {{{ proto domdocument xsl_xsltprocessor_transform_to_doc(domnode doc);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
Since:
*/
@@ -501,7 +501,7 @@
/* }}} end xsl_xsltprocessor_transform_to_doc */
-/* {{{ proto xsl_ xsl_xsltprocessor_transform_to_uri(node doc, string uri
[,boolean clone]);
+/* {{{ proto int xsl_xsltprocessor_transform_to_uri(domdocument doc, string
uri);
*/
PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
{
@@ -545,7 +545,7 @@
/* }}} end xsl_xsltprocessor_transform_to_uri */
-/* {{{ proto xsl_string xsl_xsltprocessor_transform_to_xml(node doc [,boolean
clone]);
+/* {{{ proto string xsl_xsltprocessor_transform_to_xml(domdocument doc);
*/
PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
{
@@ -621,7 +621,7 @@
}
/* }}} end xsl_xsltprocessor_set_parameter */
-/* {{{ proto xsl_ xsl_xsltprocessor_get_parameter(string namespace, string
name);
+/* {{{ proto string xsl_xsltprocessor_get_parameter(string namespace, string
name);
*/
PHP_FUNCTION(xsl_xsltprocessor_get_parameter)
{
@@ -646,7 +646,7 @@
}
/* }}} end xsl_xsltprocessor_get_parameter */
-/* {{{ proto xsl_ xsl_xsltprocessor_remove_parameter(string namespace, string
name);
+/* {{{ proto bool xsl_xsltprocessor_remove_parameter(string namespace, string
name);
*/
PHP_FUNCTION(xsl_xsltprocessor_remove_parameter)
{
@@ -669,7 +669,7 @@
}
/* }}} end xsl_xsltprocessor_remove_parameter */
-/* {{{ proto xsl_xsltprocessor_register_php_functions();
+/* {{{ proto void xsl_xsltprocessor_register_php_functions();
*/
PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
{
@@ -685,7 +685,7 @@
}
/* }}} end xsl_xsltprocessor_register_php_functions(); */
-/* {{{ proto xsl_xsltprocessor_has_exslt_support();
+/* {{{ proto bool xsl_xsltprocessor_has_exslt_support();
*/
PHP_FUNCTION(xsl_xsltprocessor_has_exslt_support)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
