summaryrefslogtreecommitdiff
path: root/ext/domxml
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-02-13 21:41:00 +0000
committerMarcus Boerger <helly@php.net>2003-02-13 21:41:00 +0000
commit0b2216e03d181d648fd52a2e2f0fac9cf66681a5 (patch)
treeb07e78bb64d6d69e466006e6cb21a745cf2ba70e /ext/domxml
parentf98f27ffa97d6e282a0ab60ab83082e90e3f295a (diff)
downloadphp-git-0b2216e03d181d648fd52a2e2f0fac9cf66681a5.tar.gz
pass tsrmls instead of fetching it always
Diffstat (limited to 'ext/domxml')
-rw-r--r--ext/domxml/php_domxml.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 4bfb061722..5e2b9b343a 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -896,10 +896,9 @@ static zval *xpath_context_get_data(void *obj)
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 @@ static zval *php_xpathcontext_new(xmlXPathContextPtr obj, int *found TSRMLS_DC)
*/
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 xmlparser_set_data(void *obj, zval *wrapper)
}
-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 @@ static zval *php_xmlparser_new(xmlParserCtxtPtr obj, int *found TSRMLS_DC)
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 @@ void *php_dom_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC
}
-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 @@ PHPAPI zval *php_domobject_new(xmlNodePtr obj, int *found, zval *wrapper_in TSR
return NULL;
}
- php_dom_set_object(wrapper, (void *) obj, rsrc_type);
+ php_dom_set_object(wrapper, (void *) obj, rsrc_type TSRMLS_CC);
return (wrapper);
}