rrichards Mon Jun 9 16:24:16 2003 EDT
Modified files:
/php4/ext/xsl php_xsl.c php_xsl.h xsltprocessor.c
Log:
changes for /ext/dom document ref count
changes for /ext/dom internal object handling
Index: php4/ext/xsl/php_xsl.c
diff -u php4/ext/xsl/php_xsl.c:1.2 php4/ext/xsl/php_xsl.c:1.3
--- php4/ext/xsl/php_xsl.c:1.2 Thu Jun 5 14:04:30 2003
+++ php4/ext/xsl/php_xsl.c Mon Jun 9 16:24:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.2 2003/06/05 18:04:30 moriyoshi Exp $ */
+/* $Id: php_xsl.c,v 1.3 2003/06/09 20:24:16 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -127,9 +127,9 @@
intern->std.in_get = 0;
intern->std.in_set = 0;
intern->ptr = NULL;
- intern->node_list = NULL;
intern->prop_handler = NULL;
intern->parameter = NULL;
+ intern->document = NULL;
base_class = class_type;
while(base_class->type != ZEND_INTERNAL_CLASS && base_class->parent != NULL) {
@@ -144,6 +144,7 @@
ALLOC_HASHTABLE(intern->parameter);
zend_hash_init(intern->parameter, 0, NULL, ZVAL_PTR_DTOR, 0);
retval.handle = zend_objects_store_put(intern, xsl_objects_dtor,
dom_objects_clone TSRMLS_CC);
+ intern->handle = retval.handle;
retval.handlers = &dom_object_handlers;
return retval;
}
Index: php4/ext/xsl/php_xsl.h
diff -u php4/ext/xsl/php_xsl.h:1.1 php4/ext/xsl/php_xsl.h:1.2
--- php4/ext/xsl/php_xsl.h:1.1 Thu Jun 5 13:10:13 2003
+++ php4/ext/xsl/php_xsl.h Mon Jun 9 16:24:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.h,v 1.1 2003/06/05 17:10:13 rrichards Exp $ */
+/* $Id: php_xsl.h,v 1.2 2003/06/09 20:24:16 rrichards Exp $ */
#ifndef PHP_XSL_H
#define PHP_XSL_H
@@ -45,8 +45,9 @@
typedef struct _xsl_object {
zend_object std;
void *ptr;
+ dom_ref_obj *document;
HashTable *prop_handler;
- node_list_pointer *node_list;
+ zend_object_handle handle;
HashTable *parameter;
} xsl_object;
Index: php4/ext/xsl/xsltprocessor.c
diff -u php4/ext/xsl/xsltprocessor.c:1.2 php4/ext/xsl/xsltprocessor.c:1.3
--- php4/ext/xsl/xsltprocessor.c:1.2 Thu Jun 5 14:54:19 2003
+++ php4/ext/xsl/xsltprocessor.c Mon Jun 9 16:24:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.2 2003/06/05 18:54:19 moriyoshi Exp $ */
+/* $Id: xsltprocessor.c,v 1.3 2003/06/09 20:24:16 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -128,13 +128,14 @@
xsltStylesheetPtr sheetp, oldsheetp;
xmlDocPtr newdocp;
xsl_object *intern;
+ dom_object *docobj;
DOM_GET_THIS(id);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr);
+ DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
/* copy the doc, so that it's not accessable from outside
FIXME: and doubling memory consumption...
*/
@@ -175,14 +176,17 @@
int ret;
char **params = NULL;
xsl_object *intern;
+ dom_object *docobj;
- DOM_GET_THIS_OBJ(sheetp, id, xsltStylesheetPtr);
-
+ id = getThis();
+ intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
+ sheetp = (xsltStylesheetPtr) intern->ptr;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr);
- intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
+ DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
+
if (intern->parameter) {
params = php_xsl_xslt_make_params(intern->parameter, 0 TSRMLS_CC);
}
@@ -193,7 +197,7 @@
}
if (newdocp) {
- DOM_RET_OBJ(rv, (xmlNodePtr) newdocp, &ret);
+ DOM_RET_OBJ(rv, (xmlNodePtr) newdocp, &ret, NULL);
} else {
RETURN_FALSE;
}
@@ -224,14 +228,17 @@
int doc_txt_len;
char **params = NULL;
xsl_object *intern;
+ dom_object *docobj;
- DOM_GET_THIS_OBJ(sheetp, id, xsltStylesheetPtr);
-
+ id = getThis();
+ intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
+ sheetp = (xsltStylesheetPtr) intern->ptr;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr);
- intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
+ DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
+
if (intern->parameter) {
params = php_xsl_xslt_make_params(intern->parameter, 0 TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
