diff options
Diffstat (limited to 'ext/dom/text.c')
| -rw-r--r-- | ext/dom/text.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/dom/text.c b/ext/dom/text.c index 1cefa665aa..fc5f2d50e0 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -72,17 +72,17 @@ PHP_METHOD(domtext, __construct) size_t value_len; zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling); + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|s", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); nodep = xmlNewText((xmlChar *) value); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -90,9 +90,9 @@ PHP_METHOD(domtext, __construct) if (intern != NULL) { oldnode = dom_object_get_node(intern); if (oldnode != NULL) { - php_libxml_node_free_resource(oldnode TSRMLS_CC); + php_libxml_node_free_resource(oldnode ); } - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern); } } /* }}} end DOMText::__construct */ @@ -102,7 +102,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-wholeText Since: DOM Level 3 */ -int dom_text_whole_text_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_text_whole_text_read(dom_object *obj, zval *retval) { xmlNodePtr node; xmlChar *wholetext = NULL; @@ -110,7 +110,7 @@ int dom_text_whole_text_read(dom_object *obj, zval *retval TSRMLS_DC) node = dom_object_get_node(obj); if (node == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -153,7 +153,7 @@ PHP_FUNCTION(dom_text_split_text) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); @@ -194,7 +194,7 @@ PHP_FUNCTION(dom_text_split_text) nnode->type = XML_TEXT_NODE; } - php_dom_create_object(nnode, return_value, intern TSRMLS_CC); + php_dom_create_object(nnode, return_value, intern); } /* }}} end dom_text_split_text */ @@ -208,7 +208,7 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content) xmlNodePtr node; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_text_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_text_class_entry) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); |