From aa1772ca7263173ee47af0d83fea866f194757ba Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 31 Jul 2001 05:44:11 +0000 Subject: More TSRMLS_FETCH annihilation --- ext/domxml/php_domxml.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ext/domxml/php_domxml.c') 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); } -- cgit v1.2.1