summaryrefslogtreecommitdiff
path: root/ext/domxml/php_domxml.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-31 05:44:11 +0000
committerZeev Suraski <zeev@php.net>2001-07-31 05:44:11 +0000
commitaa1772ca7263173ee47af0d83fea866f194757ba (patch)
treea8ea8932a07875a43423a8ffcd0100eab0c0f8a7 /ext/domxml/php_domxml.c
parent57507b4ea6bb2a38578444ca8359806f241fa8f5 (diff)
downloadphp-git-aa1772ca7263173ee47af0d83fea866f194757ba.tar.gz
More TSRMLS_FETCH annihilation
Diffstat (limited to 'ext/domxml/php_domxml.c')
-rw-r--r--ext/domxml/php_domxml.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index b20ee61138..8eeccd12ef 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -348,7 +348,7 @@ static inline void node_list_wrapper_dtor(xmlNodePtr node)
}
}
-static void php_free_xml_doc(zend_rsrc_list_entry *rsrc)
+static void php_free_xml_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
xmlDoc *doc = (xmlDoc *)rsrc->ptr;
@@ -360,7 +360,8 @@ static void php_free_xml_doc(zend_rsrc_list_entry *rsrc)
}
}
-static void php_free_xml_node(zend_rsrc_list_entry *rsrc) {
+static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
xmlNodePtr node = (xmlNodePtr) rsrc->ptr;
if (node) {
@@ -371,16 +372,17 @@ static void php_free_xml_node(zend_rsrc_list_entry *rsrc) {
}
#if defined(LIBXML_XPATH_ENABLED)
-static void php_free_xpath_context(zend_rsrc_list_entry *rsrc)
+static void php_free_xpath_context(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
xmlXPathContextPtr ctx = (xmlXPathContextPtr)rsrc->ptr;
if(ctx)
xmlXPathFreeContext(ctx);
}
-static void php_free_xpath_object(zend_rsrc_list_entry *rsrc)
+static void php_free_xpath_object(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
xmlXPathObjectPtr obj = (xmlXPathObjectPtr)rsrc->ptr;
+
if(obj)
xmlXPathFreeObject(obj);
}