cvs: php4 /ext/domxml php_domxml.c

helly Thu Feb 13 16:41:01 2003 EDT Modified files: /php4/ext/domxml php_domxml.c Log: pass tsrmls instead of fetching it always Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.235 php4/ext/domxml/php_domxml.c:1.236 --- php4/ext/domxml/php_domxml.c:1.235 Sat Jan 18 14:49:23 2003 +++ php4/ext/domxml/php_domxml.c Thu Feb 13 16:41:00 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.235 2003/01/18 19:49:23 iliaa Exp $ */ +/* $Id: php_domxml.c,v 1.236 2003/02/13 21:41:00 helly Exp $ */ /* TODO * - Support Notation Nodes @@ -896,10 +896,9 @@ return ((zval *) (((xmlXPathContextPtr) obj)->user)); } -static void php_xpath_set_context(zval *wrapper, void *obj, int rsrc_type) +static void php_xpath_set_context(zval *wrapper, void *obj, int rsrc_type TSRMLS_DC) { zval *handle, *addr; - TSRMLS_FETCH(); MAKE_STD_ZVAL(handle); Z_TYPE_P(handle) = IS_LONG; @@ -940,7 +939,7 @@ */ object_init_ex(wrapper, xpathctx_class_entry); rsrc_type = le_xpathctxp; - php_xpath_set_context(wrapper, (void *) obj, rsrc_type); + php_xpath_set_context(wrapper, (void *) obj, rsrc_type TSRMLS_CC); return (wrapper); } @@ -952,10 +951,9 @@ } -static void php_xmlparser_set_object(zval *wrapper, void *obj, int rsrc_type) +static void php_xmlparser_set_object(zval *wrapper, void *obj, int rsrc_type TSRMLS_DC) { zval *handle, *addr; - TSRMLS_FETCH(); MAKE_STD_ZVAL(handle); Z_TYPE_P(handle) = IS_LONG; @@ -988,7 +986,7 @@ MAKE_STD_ZVAL(wrapper); object_init_ex(wrapper, domxmlparser_class_entry); rsrc_type = le_domxmlparserp; - php_xmlparser_set_object(wrapper, (void *) obj, rsrc_type); + php_xmlparser_set_object(wrapper, (void *) obj, rsrc_type TSRMLS_CC); return (wrapper); } @@ -1070,10 +1068,9 @@ } -static void php_dom_set_object(zval *wrapper, void *obj, int rsrc_type) +static void php_dom_set_object(zval *wrapper, void *obj, int rsrc_type TSRMLS_DC) { zval *handle, *addr; - TSRMLS_FETCH(); MAKE_STD_ZVAL(handle); Z_TYPE_P(handle) = IS_LONG; @@ -1311,7 +1308,7 @@ return NULL; } - php_dom_set_object(wrapper, (void *) obj, rsrc_type); + php_dom_set_object(wrapper, (void *) obj, rsrc_type TSRMLS_CC); return (wrapper); }