diff options
Diffstat (limited to 'ext/dom')
| -rw-r--r-- | ext/dom/attr.c | 44 | ||||
| -rw-r--r-- | ext/dom/cdatasection.c | 14 | ||||
| -rw-r--r-- | ext/dom/characterdata.c | 30 | ||||
| -rw-r--r-- | ext/dom/comment.c | 14 | ||||
| -rw-r--r-- | ext/dom/document.c | 278 | ||||
| -rw-r--r-- | ext/dom/documentfragment.c | 20 | ||||
| -rw-r--r-- | ext/dom/documenttype.c | 32 | ||||
| -rw-r--r-- | ext/dom/dom_iterators.c | 20 | ||||
| -rw-r--r-- | ext/dom/dom_properties.h | 196 | ||||
| -rw-r--r-- | ext/dom/domerror.c | 12 | ||||
| -rw-r--r-- | ext/dom/domexception.c | 10 | ||||
| -rw-r--r-- | ext/dom/domimplementation.c | 24 | ||||
| -rw-r--r-- | ext/dom/domimplementationlist.c | 2 | ||||
| -rw-r--r-- | ext/dom/domlocator.c | 10 | ||||
| -rw-r--r-- | ext/dom/domstringlist.c | 2 | ||||
| -rw-r--r-- | ext/dom/element.c | 130 | ||||
| -rw-r--r-- | ext/dom/entity.c | 24 | ||||
| -rw-r--r-- | ext/dom/entityreference.c | 16 | ||||
| -rw-r--r-- | ext/dom/namednodemap.c | 8 | ||||
| -rw-r--r-- | ext/dom/namelist.c | 2 | ||||
| -rw-r--r-- | ext/dom/node.c | 204 | ||||
| -rw-r--r-- | ext/dom/nodelist.c | 4 | ||||
| -rw-r--r-- | ext/dom/notation.c | 8 | ||||
| -rw-r--r-- | ext/dom/php_dom.c | 364 | ||||
| -rw-r--r-- | ext/dom/php_dom.h | 34 | ||||
| -rw-r--r-- | ext/dom/processinginstruction.c | 28 | ||||
| -rw-r--r-- | ext/dom/text.c | 24 | ||||
| -rw-r--r-- | ext/dom/typeinfo.c | 4 | ||||
| -rw-r--r-- | ext/dom/xml_common.h | 10 | ||||
| -rw-r--r-- | ext/dom/xpath.c | 57 |
30 files changed, 812 insertions, 813 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index 7cef0230a4..34a6749f66 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -63,33 +63,33 @@ PHP_METHOD(domattr, __construct) size_t name_len, value_len, name_valid; 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(), "Os|s", &id, dom_attr_class_entry, &name, &name_len, &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(), "Os|s", &id, dom_attr_class_entry, &name, &name_len, &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); intern = Z_DOMOBJ_P(id); name_valid = xmlValidateName((xmlChar *) name, 0); if (name_valid != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, 1); RETURN_FALSE; } nodep = xmlNewProp(NULL, (xmlChar *) name, (xmlChar *) value); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } 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, (xmlNodePtr)nodep, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)nodep, (void *)intern); } /* }}} end DOMAttr::__construct */ @@ -99,14 +99,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403 Since: */ -int dom_attr_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_attr_name_read(dom_object *obj, zval *retval) { xmlAttrPtr attrp; attrp = (xmlAttrPtr) dom_object_get_node(obj); if (attrp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -122,7 +122,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273 Since: */ -int dom_attr_specified_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_attr_specified_read(dom_object *obj, zval *retval) { /* TODO */ ZVAL_TRUE(retval); @@ -136,13 +136,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474 Since: */ -int dom_attr_value_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_attr_value_read(dom_object *obj, zval *retval) { xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj); xmlChar *content; if (attrp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -157,18 +157,18 @@ int dom_attr_value_read(dom_object *obj, zval *retval TSRMLS_DC) } -int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_attr_value_write(dom_object *obj, zval *newval) { zend_string *str; xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj); if (attrp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } if (attrp->children) { - node_list_unlink(attrp->children TSRMLS_CC); + node_list_unlink(attrp->children); } str = zval_get_string(newval); @@ -186,14 +186,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement Since: DOM Level 2 */ -int dom_attr_owner_element_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_attr_owner_element_read(dom_object *obj, zval *retval) { xmlNodePtr nodep, nodeparent; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -203,7 +203,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(nodeparent, retval, obj TSRMLS_CC); + php_dom_create_object(nodeparent, retval, obj); return SUCCESS; } @@ -215,9 +215,9 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo Since: DOM Level 3 */ -int dom_attr_schema_type_info_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_attr_schema_type_info_read(dom_object *obj, zval *retval) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not yet implemented"); + php_error_docref(NULL, E_WARNING, "Not yet implemented"); ZVAL_NULL(retval); return SUCCESS; } @@ -234,7 +234,7 @@ PHP_FUNCTION(dom_attr_is_id) dom_object *intern; xmlAttrPtr attrp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_attr_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_attr_class_entry) == FAILURE) { return; } diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index 82af257c0a..83551766b5 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -57,26 +57,26 @@ PHP_METHOD(domcdatasection, __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(), "Os", &id, dom_cdatasection_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(), "Os", &id, dom_cdatasection_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 = xmlNewCDataBlock(NULL, (xmlChar *) value, value_len); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } intern = Z_DOMOBJ_P(id); 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 DOMCdataSection::__construct */ diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index aee54bb3d2..5946915025 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -76,13 +76,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359 Since: */ -int dom_characterdata_data_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_characterdata_data_read(dom_object *obj, zval *retval) { xmlNodePtr nodep = dom_object_get_node(obj); xmlChar *content; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -96,13 +96,13 @@ int dom_characterdata_data_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_characterdata_data_write(dom_object *obj, zval *newval) { xmlNode *nodep = dom_object_get_node(obj); zend_string *str; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -121,14 +121,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C Since: */ -int dom_characterdata_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_characterdata_length_read(dom_object *obj, zval *retval) { xmlNodePtr nodep = dom_object_get_node(obj); xmlChar *content; long length = 0; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -160,7 +160,7 @@ PHP_FUNCTION(dom_characterdata_substring_data) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -175,7 +175,7 @@ PHP_FUNCTION(dom_characterdata_substring_data) if (offset < 0 || count < 0 || offset > length) { xmlFree(cur); - php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -207,7 +207,7 @@ PHP_FUNCTION(dom_characterdata_append_data) char *arg; size_t arg_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { return; } @@ -244,7 +244,7 @@ PHP_FUNCTION(dom_characterdata_insert_data) size_t arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { return; } @@ -259,7 +259,7 @@ PHP_FUNCTION(dom_characterdata_insert_data) if (offset < 0 || offset > length) { xmlFree(cur); - php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -291,7 +291,7 @@ PHP_FUNCTION(dom_characterdata_delete_data) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -306,7 +306,7 @@ PHP_FUNCTION(dom_characterdata_delete_data) if (offset < 0 || count < 0 || offset > length) { xmlFree(cur); - php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -348,7 +348,7 @@ PHP_FUNCTION(dom_characterdata_replace_data) size_t arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { return; } @@ -363,7 +363,7 @@ PHP_FUNCTION(dom_characterdata_replace_data) if (offset < 0 || count < 0 || offset > length) { xmlFree(cur); - php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INDEX_SIZE_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 9015586fd9..0477328966 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -57,17 +57,17 @@ PHP_METHOD(domcomment, __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_comment_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_comment_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 = xmlNewComment((xmlChar *) value); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -75,9 +75,9 @@ PHP_METHOD(domcomment, __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, (xmlNodePtr)nodep, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)nodep, (void *)intern); } } /* }}} end DOMComment::__construct */ diff --git a/ext/dom/document.c b/ext/dom/document.c index 133572af3f..9f6c093f76 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -240,13 +240,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31 Since: */ -int dom_document_doctype_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_doctype_read(dom_object *obj, zval *retval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); xmlDtdPtr dtdptr; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -256,7 +256,7 @@ int dom_document_doctype_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object((xmlNodePtr) dtdptr, retval, obj TSRMLS_CC); + php_dom_create_object((xmlNodePtr) dtdptr, retval, obj); return SUCCESS; } @@ -267,9 +267,9 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA Since: */ -int dom_document_implementation_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_implementation_read(dom_object *obj, zval *retval) { - php_dom_create_implementation(retval TSRMLS_CC); + php_dom_create_implementation(retval); return SUCCESS; } @@ -280,13 +280,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092 Since: */ -int dom_document_document_element_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_document_element_read(dom_object *obj, zval *retval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); xmlNode *root; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -296,7 +296,7 @@ int dom_document_document_element_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(root, retval, obj TSRMLS_CC); + php_dom_create_object(root, retval, obj); return SUCCESS; } @@ -306,13 +306,13 @@ int dom_document_document_element_read(dom_object *obj, zval *retval TSRMLS_DC) URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-encoding Since: DOM Level 3 */ -int dom_document_encoding_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_encoding_read(dom_object *obj, zval *retval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); char *encoding; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -327,14 +327,14 @@ int dom_document_encoding_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_encoding_write(dom_object *obj, zval *newval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); zend_string *str; xmlCharEncodingHandlerPtr handler; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -349,7 +349,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC) } docp->encoding = xmlStrdup((const xmlChar *) str->val); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Document Encoding"); + php_error_docref(NULL, E_WARNING, "Invalid Document Encoding"); } zend_string_release(str); @@ -363,14 +363,14 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone Since: DOM Level 3 */ -int dom_document_standalone_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_standalone_read(dom_object *obj, zval *retval) { xmlDoc *docp; docp = (xmlDocPtr) dom_object_get_node(obj); if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -378,13 +378,13 @@ int dom_document_standalone_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_standalone_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_standalone_write(dom_object *obj, zval *newval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); int standalone; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -401,13 +401,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version Since: DOM Level 3 */ -int dom_document_version_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_version_read(dom_object *obj, zval *retval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); char *version; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -422,13 +422,13 @@ int dom_document_version_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_version_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_version_write(dom_object *obj, zval *newval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); zend_string *str; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -451,7 +451,7 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking Since: DOM Level 3 */ -int dom_document_strict_error_checking_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_strict_error_checking_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -462,12 +462,12 @@ int dom_document_strict_error_checking_read(dom_object *obj, zval *retval TSRMLS return SUCCESS; } -int dom_document_strict_error_checking_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_strict_error_checking_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->stricterror = zend_is_true(newval TSRMLS_CC); + doc_prop->stricterror = zend_is_true(newval); } return SUCCESS; @@ -478,7 +478,7 @@ int dom_document_strict_error_checking_write(dom_object *obj, zval *newval TSRML /* {{{ formatOutput boolean readonly=no */ -int dom_document_format_output_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_format_output_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -489,11 +489,11 @@ int dom_document_format_output_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_format_output_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->formatoutput = zend_is_true(newval TSRMLS_CC); + doc_prop->formatoutput = zend_is_true(newval); } return SUCCESS; @@ -503,7 +503,7 @@ int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC) /* {{{ validateOnParse boolean readonly=no */ -int dom_document_validate_on_parse_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_validate_on_parse_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -514,11 +514,11 @@ int dom_document_validate_on_parse_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_validate_on_parse_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->validateonparse = zend_is_true(newval TSRMLS_CC); + doc_prop->validateonparse = zend_is_true(newval); } return SUCCESS; @@ -528,7 +528,7 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC /* {{{ resolveExternals boolean readonly=no */ -int dom_document_resolve_externals_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_resolve_externals_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -539,11 +539,11 @@ int dom_document_resolve_externals_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_resolve_externals_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->resolveexternals = zend_is_true(newval TSRMLS_CC); + doc_prop->resolveexternals = zend_is_true(newval); } return SUCCESS; @@ -553,7 +553,7 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC /* {{{ preserveWhiteSpace boolean readonly=no */ -int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -564,11 +564,11 @@ int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval TSRMLS_D return SUCCESS; } -int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->preservewhitespace = zend_is_true(newval TSRMLS_CC); + doc_prop->preservewhitespace = zend_is_true(newval); } return SUCCESS; @@ -578,7 +578,7 @@ int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval TSRMLS_ /* {{{ recover boolean readonly=no */ -int dom_document_recover_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_recover_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -589,11 +589,11 @@ int dom_document_recover_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_recover_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_recover_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->recover = zend_is_true(newval TSRMLS_CC); + doc_prop->recover = zend_is_true(newval); } return SUCCESS; @@ -603,7 +603,7 @@ int dom_document_recover_write(dom_object *obj, zval *newval TSRMLS_DC) /* {{{ substituteEntities boolean readonly=no */ -int dom_document_substitue_entities_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_substitue_entities_read(dom_object *obj, zval *retval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); @@ -614,11 +614,11 @@ int dom_document_substitue_entities_read(dom_object *obj, zval *retval TSRMLS_DC return SUCCESS; } -int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_substitue_entities_write(dom_object *obj, zval *newval) { if (obj->document) { dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document); - doc_prop->substituteentities = zend_is_true(newval TSRMLS_CC); + doc_prop->substituteentities = zend_is_true(newval); } return SUCCESS; @@ -630,13 +630,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI Since: DOM Level 3 */ -int dom_document_document_uri_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_document_uri_read(dom_object *obj, zval *retval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); char *url; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -650,13 +650,13 @@ int dom_document_document_uri_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_document_document_uri_write(dom_object *obj, zval *newval) { xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj); zend_string *str; if (docp == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -679,7 +679,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config Since: DOM Level 3 */ -int dom_document_config_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_document_config_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; @@ -701,14 +701,14 @@ PHP_FUNCTION(dom_document_create_element) size_t name_len, value_len; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (xmlValidateName((xmlChar *) name, 0) != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -733,7 +733,7 @@ PHP_FUNCTION(dom_document_create_document_fragment) dom_object *intern; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { return; } @@ -762,7 +762,7 @@ PHP_FUNCTION(dom_document_create_text_node) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -791,7 +791,7 @@ PHP_FUNCTION(dom_document_create_comment) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -820,7 +820,7 @@ PHP_FUNCTION(dom_document_create_cdatasection) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -849,14 +849,14 @@ PHP_FUNCTION(dom_document_create_processing_instruction) dom_object *intern; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (xmlValidateName((xmlChar *) name, 0) != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -885,14 +885,14 @@ PHP_FUNCTION(dom_document_create_attribute) dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (xmlValidateName((xmlChar *) name, 0) != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -920,14 +920,14 @@ PHP_FUNCTION(dom_document_create_entity_reference) size_t name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (xmlValidateName((xmlChar *) name, 0) != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -953,16 +953,16 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name) char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(return_value, DOM_NODELIST); namednode = Z_DOMOBJ_P(return_value); local = xmlCharStrndup(name, name_len); - dom_namednode_iter(intern, 0, namednode, NULL, local, NULL TSRMLS_CC); + dom_namednode_iter(intern, 0, namednode, NULL, local, NULL); } /* }}} end dom_document_get_elements_by_tag_name */ @@ -979,7 +979,7 @@ PHP_FUNCTION(dom_document_import_node) int ret; zend_long recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|l", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -989,7 +989,7 @@ PHP_FUNCTION(dom_document_import_node) if (nodep->type == XML_HTML_DOCUMENT_NODE || nodep->type == XML_DOCUMENT_NODE || nodep->type == XML_DOCUMENT_TYPE_NODE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot import: Node Type Not Supported"); + php_error_docref(NULL, E_WARNING, "Cannot import: Node Type Not Supported"); RETURN_FALSE; } @@ -1038,7 +1038,7 @@ PHP_FUNCTION(dom_document_create_element_ns) int errorcode; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1070,7 +1070,7 @@ PHP_FUNCTION(dom_document_create_element_ns) if (nodep != NULL) { xmlFreeNode(nodep); } - php_dom_throw_error(errorcode, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(errorcode, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -1102,7 +1102,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns) dom_object *intern; int errorcode; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1126,7 +1126,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns) } } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Document Missing Root Element"); + php_error_docref(NULL, E_WARNING, "Document Missing Root Element"); RETURN_FALSE; } @@ -1139,7 +1139,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns) if (nodep != NULL) { xmlFreeProp((xmlAttrPtr) nodep); } - php_dom_throw_error(errorcode, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(errorcode, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -1164,17 +1164,17 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns) char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(return_value, DOM_NODELIST); namednode = Z_DOMOBJ_P(return_value); local = xmlCharStrndup(name, name_len); nsuri = xmlCharStrndup(uri, uri_len); - dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri TSRMLS_CC); + dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri); } /* }}} end dom_document_get_elements_by_tag_name_ns */ @@ -1192,7 +1192,7 @@ PHP_FUNCTION(dom_document_get_element_by_id) dom_object *intern; char *idname; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { return; } @@ -1229,13 +1229,13 @@ PHP_FUNCTION(dom_document_normalize_document) xmlDocPtr docp; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { return; } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - dom_normalize((xmlNodePtr) docp TSRMLS_CC); + dom_normalize((xmlNodePtr) docp); } /* }}} end dom_document_normalize_document */ @@ -1261,17 +1261,17 @@ PHP_METHOD(domdocument, __construct) int refcount; 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|ss", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_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|ss", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_len) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); docp = xmlNewDoc((xmlChar *) version); if (!docp) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -1283,22 +1283,22 @@ PHP_METHOD(domdocument, __construct) if (intern != NULL) { olddoc = (xmlDocPtr) dom_object_get_node(intern); if (olddoc != NULL) { - php_libxml_decrement_node_ptr((php_libxml_node_object *) intern TSRMLS_CC); - refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern TSRMLS_CC); + php_libxml_decrement_node_ptr((php_libxml_node_object *) intern); + refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); if (refcount != 0) { olddoc->_private = NULL; } } intern->document = NULL; - if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, docp TSRMLS_CC) == -1) { + if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, docp) == -1) { RETURN_FALSE; } - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)docp, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)docp, (void *)intern); } } /* }}} end DOMDocument::__construct */ -char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len TSRMLS_DC) /* {{{ */ +char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len ) /* {{{ */ { xmlURI *uri; xmlChar *escsource; @@ -1339,7 +1339,7 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p if ((uri->scheme == NULL || isFileUri)) { /* XXX possible buffer overflow if VCWD_REALPATH does not know size of resolved_path */ - if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path TSRMLS_CC)) { + if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path)) { xmlFreeURI(uri); return NULL; } @@ -1352,7 +1352,7 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p } /* }}} */ -static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t source_len, size_t options TSRMLS_DC) /* {{{ */ +static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t source_len, size_t options) /* {{{ */ { xmlDocPtr ret; xmlParserCtxtPtr ctxt = NULL; @@ -1383,7 +1383,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so xmlInitParser(); if (mode == DOM_LOAD_FILE) { - char *file_dest = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); + char *file_dest = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN ); if (file_dest) { ctxt = xmlCreateFileParserCtxt(file_dest); } @@ -1480,20 +1480,20 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { zend_long options = 0; id = getThis(); - if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), dom_document_class_entry TSRMLS_CC)) { + if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), dom_document_class_entry)) { id = NULL; } - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &source, &source_len, &options) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &options) == FAILURE) { return; } if (!source_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input"); + php_error_docref(NULL, E_WARNING, "Empty string supplied as input"); RETURN_FALSE; } - newdoc = dom_document_parser(id, mode, source, source_len, options TSRMLS_CC); + newdoc = dom_document_parser(id, mode, source, source_len, options); if (!newdoc) RETURN_FALSE; @@ -1504,22 +1504,22 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { docp = (xmlDocPtr) dom_object_get_node(intern); doc_prop = NULL; if (docp != NULL) { - php_libxml_decrement_node_ptr((php_libxml_node_object *) intern TSRMLS_CC); + php_libxml_decrement_node_ptr((php_libxml_node_object *) intern); doc_prop = intern->document->doc_props; intern->document->doc_props = NULL; - refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern TSRMLS_CC); + refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); if (refcount != 0) { docp->_private = NULL; } } intern->document = NULL; - if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc TSRMLS_CC) == -1) { + if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc) == -1) { RETURN_FALSE; } intern->document->doc_props = doc_prop; } - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)newdoc, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)newdoc, (void *)intern); RETURN_TRUE; } else { @@ -1562,12 +1562,12 @@ PHP_FUNCTION(dom_document_save) char *file; zend_long options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|l", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { return; } if (file_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); + php_error_docref(NULL, E_WARNING, "Invalid Filename"); RETURN_FALSE; } @@ -1608,7 +1608,7 @@ PHP_FUNCTION(dom_document_savexml) int size, format, saveempty = 0; zend_long options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { return; } @@ -1621,12 +1621,12 @@ PHP_FUNCTION(dom_document_savexml) /* Dump contents of Node */ DOM_GET_OBJ(node, nodep, xmlNodePtr, nodeobj); if (node->doc != docp) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } buf = xmlBufferCreate(); if (!buf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch buffer"); + php_error_docref(NULL, E_WARNING, "Could not fetch buffer"); RETURN_FALSE; } if (options & LIBXML_SAVE_NOEMPTYTAG) { @@ -1663,40 +1663,40 @@ PHP_FUNCTION(dom_document_savexml) } /* }}} end dom_document_savexml */ -static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) /* {{{ */ +static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur) /* {{{ */ { xmlNodePtr xincnode; xincnode = cur; cur = cur->next; xmlUnlinkNode(xincnode); - php_libxml_node_free_resource(xincnode TSRMLS_CC); + php_libxml_node_free_resource(xincnode); return cur; } /* }}} */ -static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) /* {{{ */ +static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */ { while(cur) { if (cur->type == XML_XINCLUDE_START) { - cur = php_dom_free_xinclude_node(cur TSRMLS_CC); + cur = php_dom_free_xinclude_node(cur); /* XML_XINCLUDE_END node will be a sibling of XML_XINCLUDE_START */ while(cur && cur->type != XML_XINCLUDE_END) { /* remove xinclude processing nodes from recursive xincludes */ if (cur->type == XML_ELEMENT_NODE) { - php_dom_remove_xinclude_nodes(cur->children TSRMLS_CC); + php_dom_remove_xinclude_nodes(cur->children); } cur = cur->next; } if (cur && cur->type == XML_XINCLUDE_END) { - cur = php_dom_free_xinclude_node(cur TSRMLS_CC); + cur = php_dom_free_xinclude_node(cur); } } else { if (cur->type == XML_ELEMENT_NODE) { - php_dom_remove_xinclude_nodes(cur->children TSRMLS_CC); + php_dom_remove_xinclude_nodes(cur->children); } cur = cur->next; } @@ -1715,7 +1715,7 @@ PHP_FUNCTION(dom_document_xinclude) int err; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_document_class_entry, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &id, dom_document_class_entry, &flags) == FAILURE) { return; } @@ -1732,7 +1732,7 @@ PHP_FUNCTION(dom_document_xinclude) root = root->next; } if (root) { - php_dom_remove_xinclude_nodes(root TSRMLS_CC); + php_dom_remove_xinclude_nodes(root); } if (err) { @@ -1754,7 +1754,7 @@ PHP_FUNCTION(dom_document_validate) dom_object *intern; xmlValidCtxt *cvp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { return; } @@ -1793,12 +1793,12 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; } if (source_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); + php_error_docref(NULL, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1806,9 +1806,9 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type switch (type) { case DOM_LOAD_FILE: - valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); + valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN ); if (!valid_file) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema file source"); + php_error_docref(NULL, E_WARNING, "Invalid Schema file source"); RETURN_FALSE; } parser = xmlSchemaNewParserCtxt(valid_file); @@ -1829,7 +1829,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type sptr = xmlSchemaParse(parser); xmlSchemaFreeParserCtxt(parser); if (!sptr) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema"); + php_error_docref(NULL, E_WARNING, "Invalid Schema"); RETURN_FALSE; } @@ -1889,12 +1889,12 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Op", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { return; } if (source_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Schema source"); + php_error_docref(NULL, E_WARNING, "Invalid Schema source"); RETURN_FALSE; } @@ -1902,9 +1902,9 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ switch (type) { case DOM_LOAD_FILE: - valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC); + valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN ); if (!valid_file) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG file source"); + php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source"); RETURN_FALSE; } parser = xmlRelaxNGNewParserCtxt(valid_file); @@ -1925,7 +1925,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ sptr = xmlRelaxNGParse(parser); xmlRelaxNGFreeParserCtxt(parser); if (!sptr) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid RelaxNG"); + php_error_docref(NULL, E_WARNING, "Invalid RelaxNG"); RETURN_FALSE; } @@ -1983,12 +1983,12 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ id = getThis(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &source, &source_len, &options) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &options) == FAILURE) { return; } if (!source_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input"); + php_error_docref(NULL, E_WARNING, "Empty string supplied as input"); RETURN_FALSE; } @@ -2020,28 +2020,28 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ if (!newdoc) RETURN_FALSE; - if (id != NULL && instanceof_function(Z_OBJCE_P(id), dom_document_class_entry TSRMLS_CC)) { + if (id != NULL && instanceof_function(Z_OBJCE_P(id), dom_document_class_entry)) { intern = Z_DOMOBJ_P(id); if (intern != NULL) { docp = (xmlDocPtr) dom_object_get_node(intern); doc_prop = NULL; if (docp != NULL) { - php_libxml_decrement_node_ptr((php_libxml_node_object *) intern TSRMLS_CC); + php_libxml_decrement_node_ptr((php_libxml_node_object *) intern); doc_prop = intern->document->doc_props; intern->document->doc_props = NULL; - refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern TSRMLS_CC); + refcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); if (refcount != 0) { docp->_private = NULL; } } intern->document = NULL; - if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc TSRMLS_CC) == -1) { + if (php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc) == -1) { RETURN_FALSE; } intern->document->doc_props = doc_prop; } - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)newdoc, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)newdoc, (void *)intern); RETURN_TRUE; } else { @@ -2082,12 +2082,12 @@ PHP_FUNCTION(dom_document_save_html_file) char *file; const char *encoding; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &file, &file_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &file, &file_len) == FAILURE) { return; } if (file_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Filename"); + php_error_docref(NULL, E_WARNING, "Invalid Filename"); RETURN_FALSE; } @@ -2121,7 +2121,7 @@ PHP_FUNCTION(dom_document_save_html) int size = 0, format; dom_doc_propsptr doc_props; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!", &id, dom_document_class_entry, &nodep, dom_node_class_entry) == FAILURE) { return; @@ -2136,13 +2136,13 @@ PHP_FUNCTION(dom_document_save_html) /* Dump contents of Node */ DOM_GET_OBJ(node, nodep, xmlNodePtr, nodeobj); if (node->doc != docp) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } buf = xmlBufferCreate(); if (!buf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch buffer"); + php_error_docref(NULL, E_WARNING, "Could not fetch buffer"); RETURN_FALSE; } @@ -2170,7 +2170,7 @@ PHP_FUNCTION(dom_document_save_html) RETVAL_STRINGL((const char*) mem, size); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error dumping HTML node"); + php_error_docref(NULL, E_WARNING, "Error dumping HTML node"); RETVAL_FALSE; } xmlBufferFree(buf); @@ -2203,19 +2203,19 @@ PHP_METHOD(domdocument, registerNodeClass) zend_class_entry *basece = dom_node_class_entry, *ce = NULL; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OCC!", &id, dom_document_class_entry, &basece, &ce) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OCC!", &id, dom_document_class_entry, &basece, &ce) == FAILURE) { return; } - if (ce == NULL || instanceof_function(ce, basece TSRMLS_CC)) { + if (ce == NULL || instanceof_function(ce, basece)) { DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - if (dom_set_doc_classmap(intern->document, basece, ce TSRMLS_CC) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be registered.", ce->name->val); + if (dom_set_doc_classmap(intern->document, basece, ce) == FAILURE) { + php_error_docref(NULL, E_ERROR, "Class %s could not be registered.", ce->name->val); } RETURN_TRUE; } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s is not derived from %s.", ce->name->val, basece->name->val); + php_error_docref(NULL, E_ERROR, "Class %s is not derived from %s.", ce->name->val, basece->name->val); } RETURN_FALSE; diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index d3055214f6..a7264ec96f 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -58,27 +58,27 @@ PHP_METHOD(domdocumentfragment, __construct) dom_object *intern; 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", &id, dom_documentfragment_class_entry) == 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", &id, dom_documentfragment_class_entry) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); nodep = xmlNewDocFragment(NULL); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } intern = Z_DOMOBJ_P(id); oldnode = dom_object_get_node(intern); if (oldnode != NULL) { - php_libxml_node_free_resource(oldnode TSRMLS_CC); + php_libxml_node_free_resource(oldnode ); } - /* php_dom_set_object(intern, nodep TSRMLS_CC); */ - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC); + /* php_dom_set_object(intern, nodep); */ + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern); } /* }}} end DOMDocumentFragment::__construct */ @@ -126,14 +126,14 @@ PHP_METHOD(domdocumentfragment, appendXML) { int err; xmlNodePtr lst; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c index 08b33242b1..7a1a1ddb59 100644 --- a/ext/dom/documenttype.c +++ b/ext/dom/documenttype.c @@ -43,12 +43,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134 Since: */ -int dom_documenttype_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_name_read(dom_object *obj, zval *retval) { xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj); if (dtdptr == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -64,23 +64,23 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630 Since: */ -int dom_documenttype_entities_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_entities_read(dom_object *obj, zval *retval) { xmlDtdPtr doctypep = (xmlDtdPtr) dom_object_get_node(obj); xmlHashTable *entityht; dom_object *intern; if (doctypep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } - php_dom_create_interator(retval, DOM_NAMEDNODEMAP TSRMLS_CC); + php_dom_create_interator(retval, DOM_NAMEDNODEMAP); entityht = (xmlHashTable *) doctypep->entities; intern = Z_DOMOBJ_P(retval); - dom_namednode_iter(obj, XML_ENTITY_NODE, intern, entityht, NULL, NULL TSRMLS_CC); + dom_namednode_iter(obj, XML_ENTITY_NODE, intern, entityht, NULL, NULL); return SUCCESS; } @@ -92,23 +92,23 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF Since: */ -int dom_documenttype_notations_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_notations_read(dom_object *obj, zval *retval) { xmlDtdPtr doctypep = (xmlDtdPtr) dom_object_get_node(obj); xmlHashTable *notationht; dom_object *intern; if (doctypep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } - php_dom_create_interator(retval, DOM_NAMEDNODEMAP TSRMLS_CC); + php_dom_create_interator(retval, DOM_NAMEDNODEMAP); notationht = (xmlHashTable *) doctypep->notations; intern = Z_DOMOBJ_P(retval); - dom_namednode_iter(obj, XML_NOTATION_NODE, intern, notationht, NULL, NULL TSRMLS_CC); + dom_namednode_iter(obj, XML_NOTATION_NODE, intern, notationht, NULL, NULL); return SUCCESS; } @@ -120,12 +120,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId Since: DOM Level 2 */ -int dom_documenttype_public_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_public_id_read(dom_object *obj, zval *retval) { xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj); if (dtdptr == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -145,12 +145,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId Since: DOM Level 2 */ -int dom_documenttype_system_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_system_id_read(dom_object *obj, zval *retval) { xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj); if (dtdptr == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -169,13 +169,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset Since: DOM Level 2 */ -int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval) { xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj); xmlDtdPtr intsubset; if (dtdptr == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index ee892f3703..8a64aeba25 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -122,7 +122,7 @@ xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index) /* {{{ */ } /* }}} */ -static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ +static void php_dom_iterator_dtor(zend_object_iterator *iter) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -131,7 +131,7 @@ static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ * } /* }}} */ -static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ +static int php_dom_iterator_valid(zend_object_iterator *iter) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -144,7 +144,7 @@ static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ * } /* }}} */ -zval *php_dom_iterator_current_data(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ +zval *php_dom_iterator_current_data(zend_object_iterator *iter) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -152,12 +152,12 @@ zval *php_dom_iterator_current_data(zend_object_iterator *iter TSRMLS_DC) /* {{{ } /* }}} */ -static void php_dom_iterator_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) /* {{{ */ +static void php_dom_iterator_current_key(zend_object_iterator *iter, zval *key) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; zval *object = &iterator->intern.data; - if (instanceof_function(Z_OBJCE_P(object), dom_nodelist_class_entry TSRMLS_CC)) { + if (instanceof_function(Z_OBJCE_P(object), dom_nodelist_class_entry)) { ZVAL_LONG(key, iter->index); } else { dom_object *intern = Z_DOMOBJ_P(&iterator->curobj); @@ -172,7 +172,7 @@ static void php_dom_iterator_current_key(zend_object_iterator *iter, zval *key T } /* }}} */ -static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ +static void php_dom_iterator_move_forward(zend_object_iterator *iter) /* {{{ */ { zval *object; xmlNodePtr curnode = NULL, basenode; @@ -232,7 +232,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) } err: if (curnode) { - php_dom_create_object(curnode, &iterator->curobj, objmap->baseobj TSRMLS_CC); + php_dom_create_object(curnode, &iterator->curobj, objmap->baseobj); } } /* }}} */ @@ -246,7 +246,7 @@ zend_object_iterator_funcs php_dom_iterator_funcs = { NULL }; -zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */ +zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */ { dom_object *intern; dom_nnodemap_object *objmap; @@ -260,7 +260,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i zend_error(E_ERROR, "An iterator cannot be used with foreach by reference"); } iterator = emalloc(sizeof(php_dom_iterator)); - zend_iterator_init(&iterator->intern TSRMLS_CC); + zend_iterator_init(&iterator->intern); ZVAL_COPY(&iterator->intern.data, object); iterator->intern.funcs = &php_dom_iterator_funcs; @@ -309,7 +309,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i } err: if (curnode) { - php_dom_create_object(curnode, &iterator->curobj, objmap->baseobj TSRMLS_CC); + php_dom_create_object(curnode, &iterator->curobj, objmap->baseobj); } return &iterator->intern; diff --git a/ext/dom/dom_properties.h b/ext/dom/dom_properties.h index b5c81d271b..79223fa4d4 100644 --- a/ext/dom/dom_properties.h +++ b/ext/dom/dom_properties.h @@ -22,143 +22,143 @@ #define DOM_PROPERTIES_H /* attr properties */ -int dom_attr_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_attr_specified_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_attr_value_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_attr_owner_element_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_attr_schema_type_info_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_attr_name_read(dom_object *obj, zval *retval); +int dom_attr_specified_read(dom_object *obj, zval *retval); +int dom_attr_value_read(dom_object *obj, zval *retval); +int dom_attr_value_write(dom_object *obj, zval *newval); +int dom_attr_owner_element_read(dom_object *obj, zval *retval); +int dom_attr_schema_type_info_read(dom_object *obj, zval *retval); /* characterdata properties */ -int dom_characterdata_data_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_characterdata_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_characterdata_data_read(dom_object *obj, zval *retval); +int dom_characterdata_data_write(dom_object *obj, zval *newval); +int dom_characterdata_length_read(dom_object *obj, zval *retval); /* document properties */ -int dom_document_doctype_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_implementation_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_document_element_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_actual_encoding_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_encoding_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_standalone_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_standalone_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_version_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_version_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_strict_error_checking_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_strict_error_checking_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_document_uri_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_config_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_format_output_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_validate_on_parse_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_resolve_externals_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_recover_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_recover_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_document_substitue_entities_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_DC); +int dom_document_doctype_read(dom_object *obj, zval *retval); +int dom_document_implementation_read(dom_object *obj, zval *retval); +int dom_document_document_element_read(dom_object *obj, zval *retval); +int dom_document_actual_encoding_read(dom_object *obj, zval *retval); +int dom_document_actual_encoding_write(dom_object *obj, zval *newval); +int dom_document_encoding_read(dom_object *obj, zval *retval); +int dom_document_encoding_write(dom_object *obj, zval *newval); +int dom_document_standalone_read(dom_object *obj, zval *retval); +int dom_document_standalone_write(dom_object *obj, zval *newval); +int dom_document_version_read(dom_object *obj, zval *retval); +int dom_document_version_write(dom_object *obj, zval *newval); +int dom_document_strict_error_checking_read(dom_object *obj, zval *retval); +int dom_document_strict_error_checking_write(dom_object *obj, zval *newval); +int dom_document_document_uri_read(dom_object *obj, zval *retval); +int dom_document_document_uri_write(dom_object *obj, zval *newval); +int dom_document_config_read(dom_object *obj, zval *retval); +int dom_document_format_output_read(dom_object *obj, zval *retval); +int dom_document_format_output_write(dom_object *obj, zval *newval); +int dom_document_validate_on_parse_read(dom_object *obj, zval *retval); +int dom_document_validate_on_parse_write(dom_object *obj, zval *newval); +int dom_document_resolve_externals_read(dom_object *obj, zval *retval); +int dom_document_resolve_externals_write(dom_object *obj, zval *newval); +int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval); +int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval); +int dom_document_recover_read(dom_object *obj, zval *retval); +int dom_document_recover_write(dom_object *obj, zval *newval); +int dom_document_substitue_entities_read(dom_object *obj, zval *retval); +int dom_document_substitue_entities_write(dom_object *obj, zval *newval); /* documenttype properties */ -int dom_documenttype_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_documenttype_entities_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_documenttype_notations_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_documenttype_public_id_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_documenttype_system_id_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_documenttype_name_read(dom_object *obj, zval *retval); +int dom_documenttype_entities_read(dom_object *obj, zval *retval); +int dom_documenttype_notations_read(dom_object *obj, zval *retval); +int dom_documenttype_public_id_read(dom_object *obj, zval *retval); +int dom_documenttype_system_id_read(dom_object *obj, zval *retval); +int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval); /* domerror properties */ -int dom_domerror_severity_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domerror_message_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domerror_type_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domerror_related_exception_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domerror_related_data_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domerror_location_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_domerror_severity_read(dom_object *obj, zval *retval); +int dom_domerror_message_read(dom_object *obj, zval *retval); +int dom_domerror_type_read(dom_object *obj, zval *retval); +int dom_domerror_related_exception_read(dom_object *obj, zval *retval); +int dom_domerror_related_data_read(dom_object *obj, zval *retval); +int dom_domerror_location_read(dom_object *obj, zval *retval); /* domimplementationlist properties */ -int dom_domimplementationlist_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_domimplementationlist_length_read(dom_object *obj, zval *retval); /* domlocator properties */ -int dom_domlocator_line_number_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domlocator_column_number_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domlocator_offset_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domlocator_related_node_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_domlocator_uri_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_domlocator_line_number_read(dom_object *obj, zval *retval); +int dom_domlocator_column_number_read(dom_object *obj, zval *retval); +int dom_domlocator_offset_read(dom_object *obj, zval *retval); +int dom_domlocator_related_node_read(dom_object *obj, zval *retval); +int dom_domlocator_uri_read(dom_object *obj, zval *retval); /* domstringlist properties */ -int dom_domstringlist_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_domstringlist_length_read(dom_object *obj, zval *retval); /* element properties */ -int dom_element_tag_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_element_schema_type_info_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_element_tag_name_read(dom_object *obj, zval *retval); +int dom_element_schema_type_info_read(dom_object *obj, zval *retval); /* entity properties */ -int dom_entity_public_id_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_system_id_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_notation_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_actual_encoding_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_entity_encoding_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_encoding_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_entity_version_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_entity_version_write(dom_object *obj, zval *newval TSRMLS_DC); +int dom_entity_public_id_read(dom_object *obj, zval *retval); +int dom_entity_system_id_read(dom_object *obj, zval *retval); +int dom_entity_notation_name_read(dom_object *obj, zval *retval); +int dom_entity_actual_encoding_read(dom_object *obj, zval *retval); +int dom_entity_actual_encoding_write(dom_object *obj, zval *newval); +int dom_entity_encoding_read(dom_object *obj, zval *retval); +int dom_entity_encoding_write(dom_object *obj, zval *newval); +int dom_entity_version_read(dom_object *obj, zval *retval); +int dom_entity_version_write(dom_object *obj, zval *newval); /* namednodemap properties */ -int dom_namednodemap_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_namednodemap_length_read(dom_object *obj, zval *retval); /* namelist properties */ -int dom_namelist_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_namelist_length_read(dom_object *obj, zval *retval); /* node properties */ -int dom_node_node_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_node_value_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_node_node_type_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_parent_node_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_child_nodes_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_first_child_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_last_child_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_previous_sibling_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_next_sibling_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_attributes_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_owner_document_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_namespace_uri_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_prefix_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_prefix_write(dom_object *obj, zval *newval TSRMLS_DC); -int dom_node_local_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_base_uri_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_text_content_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC); +int dom_node_node_name_read(dom_object *obj, zval *retval); +int dom_node_node_value_read(dom_object *obj, zval *retval); +int dom_node_node_value_write(dom_object *obj, zval *newval); +int dom_node_node_type_read(dom_object *obj, zval *retval); +int dom_node_parent_node_read(dom_object *obj, zval *retval); +int dom_node_child_nodes_read(dom_object *obj, zval *retval); +int dom_node_first_child_read(dom_object *obj, zval *retval); +int dom_node_last_child_read(dom_object *obj, zval *retval); +int dom_node_previous_sibling_read(dom_object *obj, zval *retval); +int dom_node_next_sibling_read(dom_object *obj, zval *retval); +int dom_node_attributes_read(dom_object *obj, zval *retval); +int dom_node_owner_document_read(dom_object *obj, zval *retval); +int dom_node_namespace_uri_read(dom_object *obj, zval *retval); +int dom_node_prefix_read(dom_object *obj, zval *retval); +int dom_node_prefix_write(dom_object *obj, zval *newval); +int dom_node_local_name_read(dom_object *obj, zval *retval); +int dom_node_base_uri_read(dom_object *obj, zval *retval); +int dom_node_text_content_read(dom_object *obj, zval *retval); +int dom_node_text_content_write(dom_object *obj, zval *newval); /* nodelist properties */ -int dom_nodelist_length_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_nodelist_length_read(dom_object *obj, zval *retval); xmlNodePtr dom_nodelist_xml_item(dom_nnodemap_object *objmap, long index); xmlNodePtr dom_nodelist_baseobj_item(dom_nnodemap_object *objmap, long index); /* notation properties */ -int dom_notation_public_id_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_notation_system_id_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_notation_public_id_read(dom_object *obj, zval *retval); +int dom_notation_system_id_read(dom_object *obj, zval *retval); /* processinginstruction properties */ -int dom_processinginstruction_target_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_processinginstruction_data_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC); +int dom_processinginstruction_target_read(dom_object *obj, zval *retval); +int dom_processinginstruction_data_read(dom_object *obj, zval *retval); +int dom_processinginstruction_data_write(dom_object *obj, zval *newval); /* text properties */ -int dom_text_whole_text_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_text_whole_text_read(dom_object *obj, zval *retval); /* typeinfo properties */ -int dom_typeinfo_type_name_read(dom_object *obj, zval *retval TSRMLS_DC); -int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_typeinfo_type_name_read(dom_object *obj, zval *retval); +int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval); #if defined(LIBXML_XPATH_ENABLED) /* xpath properties */ -int dom_xpath_document_read(dom_object *obj, zval *retval TSRMLS_DC); +int dom_xpath_document_read(dom_object *obj, zval *retval); #endif #endif /* DOM_PROPERTIERS_H */ diff --git a/ext/dom/domerror.c b/ext/dom/domerror.c index 2214c3f786..be3355b0ec 100644 --- a/ext/dom/domerror.c +++ b/ext/dom/domerror.c @@ -46,7 +46,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-severity Since: */ -int dom_domerror_severity_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_severity_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -59,7 +59,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message Since: */ -int dom_domerror_message_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_message_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -72,7 +72,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type Since: */ -int dom_domerror_type_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_type_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -85,7 +85,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException Since: */ -int dom_domerror_related_exception_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_related_exception_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -98,7 +98,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData Since: */ -int dom_domerror_related_data_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_related_data_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -111,7 +111,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location Since: */ -int dom_domerror_location_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domerror_location_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c index 4696e87f21..d7de3c4720 100644 --- a/ext/dom/domexception.c +++ b/ext/dom/domexception.c @@ -40,18 +40,18 @@ const zend_function_entry php_dom_domexception_class_functions[] = { PHP_FE_END }; -void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC) /* {{{ */ +void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error) /* {{{ */ { if (strict_error == 1) { - zend_throw_exception(dom_domexception_class_entry, error_message, error_code TSRMLS_CC); + zend_throw_exception(dom_domexception_class_entry, error_message, error_code); } else { - php_libxml_issue_error(E_WARNING, error_message TSRMLS_CC); + php_libxml_issue_error(E_WARNING, error_message); } } /* }}} */ /* {{{ php_dom_throw_error */ -void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC) +void php_dom_throw_error(int error_code, int strict_error) { char *error_message; @@ -109,7 +109,7 @@ void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC) error_message = "Unhandled Error"; } - php_dom_throw_error_with_message(error_code, error_message, strict_error TSRMLS_CC); + php_dom_throw_error_with_message(error_code, error_message, strict_error); } /* }}} end php_dom_throw_error */ diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index ea2b784b3c..49c54b5f86 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -73,7 +73,7 @@ PHP_METHOD(domimplementation, hasFeature) size_t feature_len, version_len; char *feature, *version; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -98,12 +98,12 @@ PHP_METHOD(domimplementation, createDocumentType) xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL; xmlURIPtr uri; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sss", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sss", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { return; } if (name_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "qualifiedName is required"); + php_error_docref(NULL, E_WARNING, "qualifiedName is required"); RETURN_FALSE; } @@ -118,7 +118,7 @@ PHP_METHOD(domimplementation, createDocumentType) if (uri != NULL && uri->opaque != NULL) { localname = xmlStrdup((xmlChar *) uri->opaque); if (xmlStrchr(localname, (xmlChar) ':') != NULL) { - php_dom_throw_error(NAMESPACE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(NAMESPACE_ERR, 1); xmlFreeURI(uri); xmlFree(localname); RETURN_FALSE; @@ -128,7 +128,7 @@ PHP_METHOD(domimplementation, createDocumentType) } /* TODO: Test that localname has no invalid chars - php_dom_throw_error(INVALID_CHARACTER_ERR, TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR,); */ if (uri) { @@ -139,7 +139,7 @@ PHP_METHOD(domimplementation, createDocumentType) xmlFree(localname); if (doctype == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create DocumentType"); + php_error_docref(NULL, E_WARNING, "Unable to create DocumentType"); RETURN_FALSE; } @@ -164,18 +164,18 @@ PHP_METHOD(domimplementation, createDocument) char *prefix = NULL, *localname = NULL; dom_object *doctobj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { return; } if (node != NULL) { DOM_GET_OBJ(doctype, node, xmlDtdPtr, doctobj); if (doctype->type == XML_DOCUMENT_TYPE_NODE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid DocumentType object"); + php_error_docref(NULL, E_WARNING, "Invalid DocumentType object"); RETURN_FALSE; } if (doctype->doc != NULL) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, 1 TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, 1); RETURN_FALSE; } } else { @@ -199,7 +199,7 @@ PHP_METHOD(domimplementation, createDocument) if (localname != NULL) { xmlFree(localname); } - php_dom_throw_error(errorcode, 1 TSRMLS_CC); + php_dom_throw_error(errorcode, 1); RETURN_FALSE; } @@ -233,7 +233,7 @@ PHP_METHOD(domimplementation, createDocument) xmlFreeDoc(docp); xmlFree(localname); /* Need some type of error here */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected Error"); + php_error_docref(NULL, E_WARNING, "Unexpected Error"); RETURN_FALSE; } @@ -247,7 +247,7 @@ PHP_METHOD(domimplementation, createDocument) if (doctobj != NULL) { doctobj->document = ((dom_object *)((php_libxml_node_ptr *)docp->_private)->_private)->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)doctobj, docp TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)doctobj, docp); } } /* }}} end dom_domimplementation_create_document */ diff --git a/ext/dom/domimplementationlist.c b/ext/dom/domimplementationlist.c index b4d20172f0..5feedebe27 100644 --- a/ext/dom/domimplementationlist.c +++ b/ext/dom/domimplementationlist.c @@ -52,7 +52,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-length Since: */ -int dom_domimplementationlist_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domimplementationlist_length_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; diff --git a/ext/dom/domlocator.c b/ext/dom/domlocator.c index 8fdd326fcc..e3f3ecf3b0 100644 --- a/ext/dom/domlocator.c +++ b/ext/dom/domlocator.c @@ -46,7 +46,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-line-number Since: */ -int dom_domlocator_line_number_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_line_number_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -59,7 +59,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number Since: */ -int dom_domlocator_column_number_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_column_number_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -72,7 +72,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset Since: */ -int dom_domlocator_offset_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_offset_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -85,7 +85,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node Since: */ -int dom_domlocator_related_node_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_related_node_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -98,7 +98,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri Since: */ -int dom_domlocator_uri_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_uri_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; diff --git a/ext/dom/domstringlist.c b/ext/dom/domstringlist.c index 6e8bc05bac..a13f29c91a 100644 --- a/ext/dom/domstringlist.c +++ b/ext/dom/domstringlist.c @@ -52,7 +52,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-length Since: */ -int dom_domstringlist_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domstringlist_length_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; diff --git a/ext/dom/element.c b/ext/dom/element.c index 0aff19561a..d97bfc06b3 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -165,16 +165,16 @@ PHP_METHOD(domelement, __construct) xmlNsPtr nsptr = NULL; 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(), "Os|s!s", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_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(), "Os|s!s", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); name_valid = xmlValidateName((xmlChar *) name, 0); if (name_valid != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, 1); RETURN_FALSE; } @@ -196,7 +196,7 @@ PHP_METHOD(domelement, __construct) if (nodep != NULL) { xmlFreeNode(nodep); } - php_dom_throw_error(errorcode, 1 TSRMLS_CC); + php_dom_throw_error(errorcode, 1); RETURN_FALSE; } } else { @@ -205,14 +205,14 @@ PHP_METHOD(domelement, __construct) if (prefix != NULL) { xmlFree(localname); xmlFree(prefix); - php_dom_throw_error(NAMESPACE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(NAMESPACE_ERR, 1); RETURN_FALSE; } nodep = xmlNewNode(NULL, (xmlChar *) name); } if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -223,9 +223,9 @@ PHP_METHOD(domelement, __construct) intern = Z_DOMOBJ_P(id); 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 DOMElement::__construct */ @@ -234,7 +234,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-104682815 Since: */ -int dom_element_tag_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_element_tag_name_read(dom_object *obj, zval *retval) { xmlNodePtr nodep; xmlNsPtr ns; @@ -243,7 +243,7 @@ int dom_element_tag_name_read(dom_object *obj, zval *retval TSRMLS_DC) nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -268,7 +268,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo Since: DOM Level 3 */ -int dom_element_schema_type_info_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_element_schema_type_info_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; @@ -333,7 +333,7 @@ PHP_FUNCTION(dom_element_get_attribute) xmlNodePtr attr; size_t name_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -376,25 +376,25 @@ PHP_FUNCTION(dom_element_set_attribute) dom_object *intern; char *name, *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } if (name_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name is required"); + php_error_docref(NULL, E_WARNING, "Attribute Name is required"); RETURN_FALSE; } name_valid = xmlValidateName((xmlChar *) name, 0); if (name_valid != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, 1); RETURN_FALSE; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -402,7 +402,7 @@ PHP_FUNCTION(dom_element_set_attribute) if (attr != NULL) { switch (attr->type) { case XML_ATTRIBUTE_NODE: - node_list_unlink(attr->children TSRMLS_CC); + node_list_unlink(attr->children); break; case XML_NAMESPACE_DECL: RETURN_FALSE; @@ -420,7 +420,7 @@ PHP_FUNCTION(dom_element_set_attribute) attr = (xmlNodePtr)xmlSetProp(nodep, (xmlChar *) name, (xmlChar *)value); } if (!attr) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such attribute '%s'", name); + php_error_docref(NULL, E_WARNING, "No such attribute '%s'", name); RETURN_FALSE; } @@ -441,14 +441,14 @@ PHP_FUNCTION(dom_element_remove_attribute) size_t name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -460,7 +460,7 @@ PHP_FUNCTION(dom_element_remove_attribute) switch (attrp->type) { case XML_ATTRIBUTE_NODE: if (php_dom_object_get_data(attrp) == NULL) { - node_list_unlink(attrp->children TSRMLS_CC); + node_list_unlink(attrp->children); xmlUnlinkNode(attrp); xmlFreeProp((xmlAttrPtr)attrp); } else { @@ -490,7 +490,7 @@ PHP_FUNCTION(dom_element_get_attribute_node) dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -536,26 +536,26 @@ PHP_FUNCTION(dom_element_set_attribute_node) dom_object *intern, *attrobj, *oldobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } DOM_GET_OBJ(attrp, node, xmlAttrPtr, attrobj); if (attrp->type != XML_ATTRIBUTE_NODE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute node is required"); + php_error_docref(NULL, E_WARNING, "Attribute node is required"); RETURN_FALSE; } if (!(attrp->doc == NULL || attrp->doc == nodep->doc)) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -575,7 +575,7 @@ PHP_FUNCTION(dom_element_set_attribute_node) if (attrp->doc == NULL && nodep->doc != NULL) { attrobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)attrobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)attrobj, NULL); } xmlAddChild(nodep, (xmlNodePtr) attrp); @@ -602,21 +602,21 @@ PHP_FUNCTION(dom_element_remove_attribute_node) dom_object *intern, *attrobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } DOM_GET_OBJ(attrp, node, xmlAttrPtr, attrobj); if (attrp->type != XML_ATTRIBUTE_NODE || attrp->parent != nodep) { - php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -640,16 +640,16 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name) char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(elemp, id, xmlNodePtr, intern); - php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(return_value, DOM_NODELIST); namednode = Z_DOMOBJ_P(return_value); local = xmlCharStrndup(name, name_len); - dom_namednode_iter(intern, 0, namednode, NULL, local, NULL TSRMLS_CC); + dom_namednode_iter(intern, 0, namednode, NULL, local, NULL); } /* }}} end dom_element_get_elements_by_tag_name */ @@ -667,7 +667,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns) char *uri, *name; xmlChar *strattr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -749,12 +749,12 @@ PHP_FUNCTION(dom_element_set_attribute_ns) dom_object *intern; int errorcode = 0, stricterror, is_xmlns = 0, name_valid; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!ss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!ss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } if (name_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name is required"); + php_error_docref(NULL, E_WARNING, "Attribute Name is required"); RETURN_FALSE; } @@ -763,7 +763,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns) stricterror = dom_get_strict_error(intern->document); if (dom_node_is_read_only(elemp) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_NULL(); } @@ -773,7 +773,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns) if (uri_len > 0) { nodep = (xmlNodePtr) xmlHasNsProp(elemp, (xmlChar *) localname, (xmlChar *) uri); if (nodep != NULL && nodep->type != XML_ATTRIBUTE_DECL) { - node_list_unlink(nodep->children TSRMLS_CC); + node_list_unlink(nodep->children); } if ((xmlStrEqual((xmlChar *) prefix, (xmlChar *)"xmlns") || @@ -841,7 +841,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns) } else { attr = xmlHasProp(elemp, (xmlChar *)localname); if (attr != NULL && attr->type != XML_ATTRIBUTE_DECL) { - node_list_unlink(attr->children TSRMLS_CC); + node_list_unlink(attr->children); } xmlSetProp(elemp, (xmlChar *)localname, (xmlChar *)value); } @@ -854,7 +854,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns) } if (errorcode != 0) { - php_dom_throw_error(errorcode, stricterror TSRMLS_CC); + php_dom_throw_error(errorcode, stricterror); } RETURN_NULL(); @@ -875,14 +875,14 @@ PHP_FUNCTION(dom_element_remove_attribute_ns) size_t name_len, uri_len; char *name, *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_NULL(); } @@ -906,7 +906,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns) if (attrp && attrp->type != XML_ATTRIBUTE_DECL) { if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) { - node_list_unlink(attrp->children TSRMLS_CC); + node_list_unlink(attrp->children); xmlUnlinkNode((xmlNodePtr) attrp); xmlFreeProp(attrp); } else { @@ -932,7 +932,7 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns) int ret; char *uri, *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -962,26 +962,26 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns) dom_object *intern, *attrobj, *oldobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } DOM_GET_OBJ(attrp, node, xmlAttrPtr, attrobj); if (attrp->type != XML_ATTRIBUTE_NODE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute node is required"); + php_error_docref(NULL, E_WARNING, "Attribute node is required"); RETURN_FALSE; } if (!(attrp->doc == NULL || attrp->doc == nodep->doc)) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } @@ -1007,7 +1007,7 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns) if (attrp->doc == NULL && nodep->doc != NULL) { attrobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)attrobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)attrobj, NULL); } xmlAddChild(nodep, (xmlNodePtr) attrp); @@ -1035,17 +1035,17 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns) char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } DOM_GET_OBJ(elemp, id, xmlNodePtr, intern); - php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(return_value, DOM_NODELIST); namednode = Z_DOMOBJ_P(return_value); local = xmlCharStrndup(name, name_len); nsuri = xmlCharStrndup(uri, uri_len); - dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri TSRMLS_CC); + dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri); } /* }}} end dom_element_get_elements_by_tag_name_ns */ @@ -1063,7 +1063,7 @@ PHP_FUNCTION(dom_element_has_attribute) size_t name_len; xmlNodePtr attr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1092,7 +1092,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns) char *uri, *name; xmlChar *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1149,20 +1149,20 @@ PHP_FUNCTION(dom_element_set_id_attribute) size_t name_len; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_NULL(); } attrp = xmlHasNsProp(nodep, (xmlChar *)name, NULL); if (attrp == NULL || attrp->type == XML_ATTRIBUTE_DECL) { - php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document)); } else { php_set_attribute_id(attrp, is_id); } @@ -1185,20 +1185,20 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns) char *uri, *name; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ossb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { return; } DOM_GET_OBJ(elemp, id, xmlNodePtr, intern); if (dom_node_is_read_only(elemp) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_NULL(); } attrp = xmlHasNsProp(elemp, (xmlChar *)name, (xmlChar *)uri); if (attrp == NULL || attrp->type == XML_ATTRIBUTE_DECL) { - php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document)); } else { php_set_attribute_id(attrp, is_id); } @@ -1219,21 +1219,21 @@ PHP_FUNCTION(dom_element_set_id_attribute_node) dom_object *intern, *attrobj; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OOb", &id, dom_element_class_entry, &node, dom_attr_class_entry, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOb", &id, dom_element_class_entry, &node, dom_attr_class_entry, &is_id) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (dom_node_is_read_only(nodep) == SUCCESS) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, dom_get_strict_error(intern->document)); RETURN_NULL(); } DOM_GET_OBJ(attrp, node, xmlAttrPtr, attrobj); if (attrp->parent != nodep) { - php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document)); } else { php_set_attribute_id(attrp, is_id); } diff --git a/ext/dom/entity.c b/ext/dom/entity.c index e0625fdd72..07c2b0cab3 100644 --- a/ext/dom/entity.c +++ b/ext/dom/entity.c @@ -44,12 +44,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7303025 Since: */ -int dom_entity_public_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_public_id_read(dom_object *obj, zval *retval) { xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -69,12 +69,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E Since: */ -int dom_entity_system_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_system_id_read(dom_object *obj, zval *retval) { xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -94,13 +94,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38 Since: */ -int dom_entity_notation_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_notation_name_read(dom_object *obj, zval *retval) { xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj); char *content; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -122,13 +122,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding Since: DOM Level 3 */ -int dom_entity_actual_encoding_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_actual_encoding_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; } -int dom_entity_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_entity_actual_encoding_write(dom_object *obj, zval *newval) { return SUCCESS; } @@ -140,13 +140,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding Since: DOM Level 3 */ -int dom_entity_encoding_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_encoding_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; } -int dom_entity_encoding_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_entity_encoding_write(dom_object *obj, zval *newval) { return SUCCESS; } @@ -158,13 +158,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version Since: DOM Level 3 */ -int dom_entity_version_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_entity_version_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; } -int dom_entity_version_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_entity_version_write(dom_object *obj, zval *newval) { return SUCCESS; } diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index 1c3e60e4f1..9505654f9d 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -56,24 +56,24 @@ PHP_METHOD(domentityreference, __construct) size_t name_len, name_valid; 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(), "Os", &id, dom_entityreference_class_entry, &name, &name_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(), "Os", &id, dom_entityreference_class_entry, &name, &name_len) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); name_valid = xmlValidateName((xmlChar *) name, 0); if (name_valid != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, 1); RETURN_FALSE; } node = xmlNewReference(NULL, (xmlChar *) name); if (!node) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -81,9 +81,9 @@ PHP_METHOD(domentityreference, __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, node, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, node, (void *)intern); } } /* }}} end DOMEntityReference::__construct */ diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index ab314851be..fb110345ff 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -83,7 +83,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E Since: */ -int dom_namednodemap_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_namednodemap_length_read(dom_object *obj, zval *retval) { dom_nnodemap_object *objmap; xmlAttrPtr curnode; @@ -136,7 +136,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { return; } @@ -210,7 +210,7 @@ PHP_FUNCTION(dom_namednodemap_item) xmlNodePtr nodep, curnode; int count; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_namednodemap_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_namednodemap_class_entry, &index) == FAILURE) { return; } if (index >= 0) { @@ -269,7 +269,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { return; } diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c index 3f0b8e1640..9955cb1b6c 100644 --- a/ext/dom/namelist.c +++ b/ext/dom/namelist.c @@ -55,7 +55,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-length Since: */ -int dom_namelist_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_namelist_length_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; diff --git a/ext/dom/node.c b/ext/dom/node.c index b2079ffda2..a51cb52747 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -196,7 +196,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D095 Since: */ -int dom_node_node_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_node_name_read(dom_object *obj, zval *retval) { xmlNode *nodep; xmlNsPtr ns; @@ -206,7 +206,7 @@ int dom_node_node_name_read(dom_object *obj, zval *retval TSRMLS_DC) nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -259,7 +259,7 @@ int dom_node_node_name_read(dom_object *obj, zval *retval TSRMLS_DC) str = "#text"; break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Node Type"); + php_error_docref(NULL, E_WARNING, "Invalid Node Type"); } if (str != NULL) { @@ -283,13 +283,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080 Since: */ -int dom_node_node_value_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_node_value_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); char *str = NULL; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -322,12 +322,12 @@ int dom_node_node_value_read(dom_object *obj, zval *retval TSRMLS_DC) } -int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_node_node_value_write(dom_object *obj, zval *newval) { xmlNode *nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -336,7 +336,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC) case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: if (nodep->children) { - node_list_unlink(nodep->children TSRMLS_CC); + node_list_unlink(nodep->children); } case XML_TEXT_NODE: case XML_COMMENT_NODE: @@ -362,14 +362,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558 Since: */ -int dom_node_node_type_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_node_type_read(dom_object *obj, zval *retval) { xmlNode *nodep; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -390,14 +390,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317 Since: */ -int dom_node_parent_node_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_parent_node_read(dom_object *obj, zval *retval) { xmlNode *nodep, *nodeparent; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -407,7 +407,7 @@ int dom_node_parent_node_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(nodeparent, retval, obj TSRMLS_CC); + php_dom_create_object(nodeparent, retval, obj); return SUCCESS; } @@ -418,22 +418,22 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987 Since: */ -int dom_node_child_nodes_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_child_nodes_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); dom_object *intern; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } if (dom_node_children_valid(nodep) == FAILURE) { ZVAL_NULL(retval); } else { - php_dom_create_interator(retval, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(retval, DOM_NODELIST); intern = Z_DOMOBJ_P(retval); - dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL TSRMLS_CC); + dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL); } return SUCCESS; @@ -446,14 +446,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388 Since: */ -int dom_node_first_child_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_first_child_read(dom_object *obj, zval *retval) { xmlNode *nodep, *first = NULL; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -466,7 +466,7 @@ int dom_node_first_child_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(first, retval, obj TSRMLS_CC); + php_dom_create_object(first, retval, obj); return SUCCESS; } @@ -477,14 +477,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB Since: */ -int dom_node_last_child_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_last_child_read(dom_object *obj, zval *retval) { xmlNode *nodep, *last = NULL; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -497,7 +497,7 @@ int dom_node_last_child_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(last, retval, obj TSRMLS_CC); + php_dom_create_object(last, retval, obj); return SUCCESS; } @@ -508,14 +508,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8 Since: */ -int dom_node_previous_sibling_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_previous_sibling_read(dom_object *obj, zval *retval) { xmlNode *nodep, *prevsib; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -525,7 +525,7 @@ int dom_node_previous_sibling_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } - php_dom_create_object(prevsib, retval, obj TSRMLS_CC); + php_dom_create_object(prevsib, retval, obj); return SUCCESS; } @@ -536,14 +536,14 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F Since: */ -int dom_node_next_sibling_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_next_sibling_read(dom_object *obj, zval *retval) { xmlNode *nodep, *nextsib; nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -552,7 +552,7 @@ int dom_node_next_sibling_read(dom_object *obj, zval *retval TSRMLS_DC) return FAILURE; } - php_dom_create_object(nextsib, retval, obj TSRMLS_CC); + php_dom_create_object(nextsib, retval, obj); return SUCCESS; } @@ -563,20 +563,20 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096 Since: */ -int dom_node_attributes_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_attributes_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); dom_object *intern; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } if (nodep->type == XML_ELEMENT_NODE) { - php_dom_create_interator(retval, DOM_NAMEDNODEMAP TSRMLS_CC); + php_dom_create_interator(retval, DOM_NAMEDNODEMAP); intern = Z_DOMOBJ_P(retval); - dom_namednode_iter(obj, XML_ATTRIBUTE_NODE, intern, NULL, NULL, NULL TSRMLS_CC); + dom_namednode_iter(obj, XML_ATTRIBUTE_NODE, intern, NULL, NULL, NULL); } else { ZVAL_NULL(retval); } @@ -591,13 +591,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc Since: */ -int dom_node_owner_document_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_owner_document_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); xmlDocPtr docp; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -611,7 +611,7 @@ int dom_node_owner_document_read(dom_object *obj, zval *retval TSRMLS_DC) return FAILURE; } - php_dom_create_object((xmlNodePtr) docp, retval, obj TSRMLS_CC); + php_dom_create_object((xmlNodePtr) docp, retval, obj); return SUCCESS; } @@ -622,13 +622,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname Since: DOM Level 2 */ -int dom_node_namespace_uri_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_namespace_uri_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); char *str = NULL; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -661,14 +661,14 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix Since: DOM Level 2 */ -int dom_node_prefix_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_prefix_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); xmlNsPtr ns; char *str = NULL; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -695,7 +695,7 @@ int dom_node_prefix_read(dom_object *obj, zval *retval TSRMLS_DC) } -int dom_node_prefix_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_node_prefix_write(dom_object *obj, zval *newval) { zend_string *str; xmlNode *nodep, *nsnode = NULL; @@ -706,7 +706,7 @@ int dom_node_prefix_write(dom_object *obj, zval *newval TSRMLS_DC) nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -746,7 +746,7 @@ int dom_node_prefix_write(dom_object *obj, zval *newval TSRMLS_DC) if (ns == NULL) { zend_string_release(str); - php_dom_throw_error(NAMESPACE_ERR, dom_get_strict_error(obj->document) TSRMLS_CC); + php_dom_throw_error(NAMESPACE_ERR, dom_get_strict_error(obj->document)); return FAILURE; } @@ -768,12 +768,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN Since: DOM Level 2 */ -int dom_node_local_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_local_name_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -793,13 +793,13 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-baseURI Since: DOM Level 3 */ -int dom_node_base_uri_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_base_uri_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); xmlChar *baseuri; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -821,13 +821,13 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent Since: DOM Level 3 */ -int dom_node_text_content_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_node_text_content_read(dom_object *obj, zval *retval) { xmlNode *nodep = dom_object_get_node(obj); char *str = NULL; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -843,14 +843,14 @@ int dom_node_text_content_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_node_text_content_write(dom_object *obj, zval *newval) { xmlNode *nodep = dom_object_get_node(obj); zend_string *str; xmlChar *enc_str; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -865,7 +865,7 @@ int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC) /* }}} */ -static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj TSRMLS_DC) /* {{{ */ +static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj) /* {{{ */ { xmlNodePtr newchild, node; @@ -893,7 +893,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, if (node->_private != NULL) { childobj = node->_private; childobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL); } } if (node == fragment->last) { @@ -921,7 +921,7 @@ PHP_FUNCTION(dom_node_insert_before) dom_object *intern, *childobj, *refpobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|O!", &id, dom_node_class_entry, &node, dom_node_class_entry, &ref, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|O!", &id, dom_node_class_entry, &node, dom_node_class_entry, &ref, dom_node_class_entry) == FAILURE) { return; } @@ -939,34 +939,34 @@ PHP_FUNCTION(dom_node_insert_before) if (dom_node_is_read_only(parentp) == SUCCESS || (child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; } if (dom_hierarchy(parentp, child) == FAILURE) { - php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror); RETURN_FALSE; } if (child->doc != parentp->doc && child->doc != NULL) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror); RETURN_FALSE; } if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Document Fragment is empty"); + php_error_docref(NULL, E_WARNING, "Document Fragment is empty"); RETURN_FALSE; } if (child->doc == NULL && parentp->doc != NULL) { childobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL); } if (ref != NULL) { DOM_GET_OBJ(refp, ref, xmlNodePtr, refpobj); if (refp->parent != parentp) { - php_dom_throw_error(NOT_FOUND_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, stricterror); RETURN_FALSE; } @@ -1003,14 +1003,14 @@ PHP_FUNCTION(dom_node_insert_before) if (lastattr != NULL && lastattr->type != XML_ATTRIBUTE_DECL) { if (lastattr != (xmlAttrPtr) child) { xmlUnlinkNode((xmlNodePtr) lastattr); - php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC); + php_libxml_node_free_resource((xmlNodePtr) lastattr); } else { DOM_RET_OBJ(child, &ret, intern); return; } } } else if (child->type == XML_DOCUMENT_FRAG_NODE) { - new_child = _php_dom_insert_fragment(parentp, refp->prev, refp, child, intern, childobj TSRMLS_CC); + new_child = _php_dom_insert_fragment(parentp, refp->prev, refp, child, intern, childobj); } if (new_child == NULL) { @@ -1045,14 +1045,14 @@ PHP_FUNCTION(dom_node_insert_before) if (lastattr != NULL && lastattr->type != XML_ATTRIBUTE_DECL) { if (lastattr != (xmlAttrPtr) child) { xmlUnlinkNode((xmlNodePtr) lastattr); - php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC); + php_libxml_node_free_resource((xmlNodePtr) lastattr); } else { DOM_RET_OBJ(child, &ret, intern); return; } } } else if (child->type == XML_DOCUMENT_FRAG_NODE) { - new_child = _php_dom_insert_fragment(parentp, parentp->last, NULL, child, intern, childobj TSRMLS_CC); + new_child = _php_dom_insert_fragment(parentp, parentp->last, NULL, child, intern, childobj); } if (new_child == NULL) { new_child = xmlAddChild(parentp, child); @@ -1060,7 +1060,7 @@ PHP_FUNCTION(dom_node_insert_before) } if (NULL == new_child) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't add newnode as the previous sibling of refnode"); + php_error_docref(NULL, E_WARNING, "Couldn't add newnode as the previous sibling of refnode"); RETURN_FALSE; } @@ -1084,7 +1084,7 @@ PHP_FUNCTION(dom_node_replace_child) int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OOO", &id, dom_node_class_entry, &newnode, dom_node_class_entry, &oldnode, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO", &id, dom_node_class_entry, &newnode, dom_node_class_entry, &oldnode, dom_node_class_entry) == FAILURE) { return; } @@ -1106,17 +1106,17 @@ PHP_FUNCTION(dom_node_replace_child) if (dom_node_is_read_only(nodep) == SUCCESS || (newchild->parent != NULL && dom_node_is_read_only(newchild->parent) == SUCCESS)) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; } if (newchild->doc != nodep->doc && newchild->doc != NULL) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror); RETURN_FALSE; } if (dom_hierarchy(nodep, newchild) == FAILURE) { - php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror); RETURN_FALSE; } @@ -1137,7 +1137,7 @@ PHP_FUNCTION(dom_node_replace_child) xmlUnlinkNode(oldchild); - newchild = _php_dom_insert_fragment(nodep, prevsib, nextsib, newchild, intern, newchildobj TSRMLS_CC); + newchild = _php_dom_insert_fragment(nodep, prevsib, nextsib, newchild, intern, newchildobj); if (newchild) { dom_reconcile_ns(nodep->doc, newchild); } @@ -1145,7 +1145,7 @@ PHP_FUNCTION(dom_node_replace_child) if (newchild->doc == NULL && nodep->doc != NULL) { xmlSetTreeDoc(newchild, nodep->doc); newchildobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)newchildobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)newchildobj, NULL); } xmlReplaceNode(oldchild, newchild); dom_reconcile_ns(nodep->doc, newchild); @@ -1153,7 +1153,7 @@ PHP_FUNCTION(dom_node_replace_child) DOM_RET_OBJ(oldchild, &ret, intern); return; } else { - php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } } @@ -1170,7 +1170,7 @@ PHP_FUNCTION(dom_node_remove_child) dom_object *intern, *childobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { return; } @@ -1186,13 +1186,13 @@ PHP_FUNCTION(dom_node_remove_child) if (dom_node_is_read_only(nodep) == SUCCESS || (child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; } children = nodep->children; if (!children) { - php_dom_throw_error(NOT_FOUND_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, stricterror); RETURN_FALSE; } @@ -1205,7 +1205,7 @@ PHP_FUNCTION(dom_node_remove_child) children = children->next; } - php_dom_throw_error(NOT_FOUND_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NOT_FOUND_ERR, stricterror); RETURN_FALSE } /* }}} end dom_node_remove_child */ @@ -1221,7 +1221,7 @@ PHP_FUNCTION(dom_node_append_child) dom_object *intern, *childobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { return; } @@ -1237,28 +1237,28 @@ PHP_FUNCTION(dom_node_append_child) if (dom_node_is_read_only(nodep) == SUCCESS || (child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) { - php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; } if (dom_hierarchy(nodep, child) == FAILURE) { - php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror); RETURN_FALSE; } if (!(child->doc == NULL || child->doc == nodep->doc)) { - php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror TSRMLS_CC); + php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror); RETURN_FALSE; } if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Document Fragment is empty"); + php_error_docref(NULL, E_WARNING, "Document Fragment is empty"); RETURN_FALSE; } if (child->doc == NULL && nodep->doc != NULL) { childobj->document = intern->document; - php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)childobj, NULL); } if (child->parent != NULL){ @@ -1290,17 +1290,17 @@ PHP_FUNCTION(dom_node_append_child) if (lastattr != NULL && lastattr->type != XML_ATTRIBUTE_DECL) { if (lastattr != (xmlAttrPtr) child) { xmlUnlinkNode((xmlNodePtr) lastattr); - php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC); + php_libxml_node_free_resource((xmlNodePtr) lastattr); } } } else if (child->type == XML_DOCUMENT_FRAG_NODE) { - new_child = _php_dom_insert_fragment(nodep, nodep->last, NULL, child, intern, childobj TSRMLS_CC); + new_child = _php_dom_insert_fragment(nodep, nodep->last, NULL, child, intern, childobj); } if (new_child == NULL) { new_child = xmlAddChild(nodep, child); if (new_child == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't append node"); + php_error_docref(NULL, E_WARNING, "Couldn't append node"); RETURN_FALSE; } } @@ -1321,7 +1321,7 @@ PHP_FUNCTION(dom_node_has_child_nodes) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { return; } @@ -1351,7 +1351,7 @@ PHP_FUNCTION(dom_node_clone_node) dom_object *intern; zend_long recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &id, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1410,13 +1410,13 @@ PHP_FUNCTION(dom_node_normalize) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { return; } DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); - dom_normalize(nodep TSRMLS_CC); + dom_normalize(nodep); } /* }}} end dom_node_normalize */ @@ -1431,7 +1431,7 @@ PHP_FUNCTION(dom_node_is_supported) size_t feature_len, version_len; char *feature, *version; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -1453,7 +1453,7 @@ PHP_FUNCTION(dom_node_has_attributes) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { return; } @@ -1490,7 +1490,7 @@ PHP_FUNCTION(dom_node_is_same_node) xmlNodePtr nodeotherp, nodep; dom_object *intern, *nodeotherobj; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { return; } @@ -1519,7 +1519,7 @@ PHP_FUNCTION(dom_node_lookup_prefix) size_t uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1570,7 +1570,7 @@ PHP_FUNCTION(dom_node_is_default_namespace) size_t uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1603,7 +1603,7 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri) size_t prefix_len; char *prefix; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { return; } @@ -1682,13 +1682,13 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ xmlXPathObjectPtr xpathobjp=NULL; if (mode == 0) { - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|bba!a!", &id, dom_node_class_entry, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } } else { - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; @@ -1700,7 +1700,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ docp = nodep->doc; if (! docp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node must be associated with a document"); + php_error_docref(NULL, E_WARNING, "Node must be associated with a document"); RETURN_FALSE; } @@ -1717,7 +1717,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ xmlXPathFreeObject(xpathobjp); } xmlXPathFreeContext(ctxp); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset."); + php_error_docref(NULL, E_WARNING, "XPath query did not return a nodeset."); RETURN_FALSE; } } @@ -1731,7 +1731,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ if (tmp && Z_TYPE_P(tmp) == IS_STRING) { xquery = Z_STRVAL_P(tmp); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'query' missing from xpath array or is not a string"); + php_error_docref(NULL, E_WARNING, "'query' missing from xpath array or is not a string"); RETURN_FALSE; } @@ -1761,7 +1761,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ xmlXPathFreeObject(xpathobjp); } xmlXPathFreeContext(ctxp); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset."); + php_error_docref(NULL, E_WARNING, "XPath query did not return a nodeset."); RETURN_FALSE; } } @@ -1780,7 +1780,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ } ZEND_HASH_FOREACH_END(); inclusive_ns_prefixes[nscount] = NULL; } else { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, + php_error_docref(NULL, E_NOTICE, "Inclusive namespace prefixes only allowed in exclusive mode."); } } diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 15071739d2..fa67cc1041 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -51,7 +51,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-203510337 Since: */ -int dom_nodelist_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_nodelist_length_read(dom_object *obj, zval *retval) { dom_nnodemap_object *objmap; xmlNodePtr nodep, curnode; @@ -114,7 +114,7 @@ PHP_FUNCTION(dom_nodelist_item) xmlNodePtr nodep, curnode; int count = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { return; } diff --git a/ext/dom/notation.c b/ext/dom/notation.c index b26608adcf..cf4039f3ab 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -45,12 +45,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0 Since: */ -int dom_notation_public_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_notation_public_id_read(dom_object *obj, zval *retval) { xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -70,12 +70,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 Since: */ -int dom_notation_system_id_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_notation_system_id_read(dom_object *obj, zval *retval) { xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index c25cbaba58..6dd0f8e020 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -103,15 +103,15 @@ static HashTable dom_xpath_prop_handlers; #endif /* }}} */ -typedef int (*dom_read_t)(dom_object *obj, zval *retval TSRMLS_DC); -typedef int (*dom_write_t)(dom_object *obj, zval *newval TSRMLS_DC); +typedef int (*dom_read_t)(dom_object *obj, zval *retval); +typedef int (*dom_write_t)(dom_object *obj, zval *newval); typedef struct _dom_prop_handler { dom_read_t read_func; dom_write_t write_func; } dom_prop_handler; -static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) { +static zend_object_handlers* dom_get_obj_handlers(void) { return &dom_object_handlers; } @@ -206,7 +206,7 @@ static void dom_copy_doc_props(php_libxml_ref_obj *source_doc, php_libxml_ref_ob } } -int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce TSRMLS_DC) +int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce) { dom_doc_propsptr doc_props; @@ -228,7 +228,7 @@ int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, return SUCCESS; } -zend_class_entry *dom_get_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece TSRMLS_DC) +zend_class_entry *dom_get_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece) { dom_doc_propsptr doc_props; @@ -284,23 +284,23 @@ PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj) /* }}} end php_dom_object_get_data */ /* {{{ dom_read_na */ -static int dom_read_na(dom_object *obj, zval *retval TSRMLS_DC) +static int dom_read_na(dom_object *obj, zval *retval) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot read property"); + php_error_docref(NULL, E_ERROR, "Cannot read property"); return FAILURE; } /* }}} */ /* {{{ dom_write_na */ -static int dom_write_na(dom_object *obj, zval *newval TSRMLS_DC) +static int dom_write_na(dom_object *obj, zval *newval) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot write property"); + php_error_docref(NULL, E_ERROR, "Cannot write property"); return FAILURE; } /* }}} */ /* {{{ dom_register_prop_handler */ -static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_read_t read_func, dom_write_t write_func TSRMLS_DC) +static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_read_t read_func, dom_write_t write_func) { dom_prop_handler hnd; @@ -310,7 +310,7 @@ static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_r } /* }}} */ -static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot TSRMLS_DC) /* {{{ */ +static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot) /* {{{ */ { dom_object *obj = Z_DOMOBJ_P(object); zend_string *member_str = zval_get_string(member); @@ -318,7 +318,7 @@ static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, void if (!obj->prop_handler || !zend_hash_exists(obj->prop_handler, member_str)) { zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - retval = std_hnd->get_property_ptr_ptr(object, member, type, cache_slot TSRMLS_CC); + retval = std_hnd->get_property_ptr_ptr(object, member, type, cache_slot); } zend_string_release(member_str); @@ -327,7 +327,7 @@ static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, void /* }}} */ /* {{{ dom_read_property */ -zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv TSRMLS_DC) +zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) { dom_object *obj = Z_DOMOBJ_P(object); zend_string *member_str = zval_get_string(member); @@ -336,12 +336,12 @@ zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot, if (obj->prop_handler != NULL) { hnd = zend_hash_find_ptr(obj->prop_handler, member_str); - } else if (instanceof_function(obj->std.ce, dom_node_class_entry TSRMLS_CC)) { + } else if (instanceof_function(obj->std.ce, dom_node_class_entry)) { php_error(E_WARNING, "Couldn't fetch %s. Node no longer exists", obj->std.ce->name->val); } if (hnd) { - int ret = hnd->read_func(obj, rv TSRMLS_CC); + int ret = hnd->read_func(obj, rv); if (ret == SUCCESS) { retval = rv; } else { @@ -349,7 +349,7 @@ zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot, } } else { zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - retval = std_hnd->read_property(object, member, type, cache_slot, rv TSRMLS_CC); + retval = std_hnd->read_property(object, member, type, cache_slot, rv); } zend_string_release(member_str); @@ -358,7 +358,7 @@ zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot, /* }}} */ /* {{{ dom_write_property */ -void dom_write_property(zval *object, zval *member, zval *value, void **cache_slot TSRMLS_DC) +void dom_write_property(zval *object, zval *member, zval *value, void **cache_slot) { dom_object *obj = Z_DOMOBJ_P(object); zend_string *member_str = zval_get_string(member); @@ -368,10 +368,10 @@ void dom_write_property(zval *object, zval *member, zval *value, void **cache_sl hnd = zend_hash_find_ptr(obj->prop_handler, member_str); } if (hnd) { - hnd->write_func(obj, value TSRMLS_CC); + hnd->write_func(obj, value); } else { zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - std_hnd->write_property(object, member, value, cache_slot TSRMLS_CC); + std_hnd->write_property(object, member, value, cache_slot); } zend_string_release(member_str); @@ -379,7 +379,7 @@ void dom_write_property(zval *object, zval *member, zval *value, void **cache_sl /* }}} */ /* {{{ dom_property_exists */ -static int dom_property_exists(zval *object, zval *member, int check_empty, void **cache_slot TSRMLS_DC) +static int dom_property_exists(zval *object, zval *member, int check_empty, void **cache_slot) { dom_object *obj = Z_DOMOBJ_P(object); zend_string *member_str = zval_get_string(member); @@ -394,9 +394,9 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void if (check_empty == 2) { retval = 1; - } else if (hnd->read_func(obj, &tmp TSRMLS_CC) == SUCCESS) { + } else if (hnd->read_func(obj, &tmp) == SUCCESS) { if (check_empty == 1) { - retval = zend_is_true(&tmp TSRMLS_CC); + retval = zend_is_true(&tmp); } else if (check_empty == 0) { retval = (Z_TYPE(tmp) != IS_NULL); } @@ -404,7 +404,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void } } else { zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - retval = std_hnd->has_property(object, member, check_empty, cache_slot TSRMLS_CC); + retval = std_hnd->has_property(object, member, check_empty, cache_slot); } zend_string_release(member_str); @@ -412,7 +412,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void } /* }}} */ -static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC) /* {{{ */ +static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp) /* {{{ */ { dom_object *obj = Z_DOMOBJ_P(object); HashTable *debug_info, @@ -426,7 +426,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC ALLOC_HASHTABLE(debug_info); - std_props = zend_std_get_properties(object TSRMLS_CC); + std_props = zend_std_get_properties(object); zend_array_dup(debug_info, std_props); if (!prop_handlers) { @@ -442,7 +442,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC zend_string *string_key; zend_ulong num_key; - if (entry->read_func(obj, &value TSRMLS_CC) == FAILURE) { + if (entry->read_func(obj, &value) == FAILURE) { continue; } @@ -465,13 +465,13 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC } /* }}} */ -static HashTable* dom_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */ +static HashTable* dom_get_debug_info(zval *object, int *is_temp) /* {{{ */ { - return dom_get_debug_info_helper(object, is_temp TSRMLS_CC); + return dom_get_debug_info_helper(object, is_temp); } /* }}} */ -void *php_dom_export_node(zval *object TSRMLS_DC) /* {{{ */ +void *php_dom_export_node(zval *object) /* {{{ */ { php_libxml_node_object *intern; xmlNodePtr nodep = NULL; @@ -494,33 +494,33 @@ PHP_FUNCTION(dom_import_simplexml) php_libxml_node_object *nodeobj; int ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &node) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &node) == FAILURE) { return; } nodeobj = (php_libxml_node_object *) ((char *) Z_OBJ_P(node) - Z_OBJ_HT_P(node)->offset); - nodep = php_libxml_import_node(node TSRMLS_CC); + nodep = php_libxml_import_node(node); if (nodep && nodeobj && (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE)) { DOM_RET_OBJ((xmlNodePtr) nodep, &ret, (dom_object *)nodeobj); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import"); + php_error_docref(NULL, E_WARNING, "Invalid Nodetype to import"); RETURN_NULL(); } } /* }}} */ -static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC); +static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy); -static zend_object *dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) /* {{{ */ +static zend_object *dom_objects_store_clone_obj(zval *zobject) /* {{{ */ { dom_object *intern = Z_DOMOBJ_P(zobject); - dom_object *clone = dom_objects_set_class(intern->std.ce, 0 TSRMLS_CC); + dom_object *clone = dom_objects_set_class(intern->std.ce, 0); - clone->std.handlers = dom_get_obj_handlers(TSRMLS_C); - zend_objects_clone_members(&clone->std, &intern->std TSRMLS_CC); + clone->std.handlers = dom_get_obj_handlers(); + zend_objects_clone_members(&clone->std, &intern->std); - if (instanceof_function(intern->std.ce, dom_node_class_entry TSRMLS_CC)) { + if (instanceof_function(intern->std.ce, dom_node_class_entry)) { xmlNodePtr node = (xmlNodePtr)dom_object_get_node(intern); if (node != NULL) { xmlNodePtr cloned_node = xmlDocCopyNode(node, node->doc, 1); @@ -529,8 +529,8 @@ static zend_object *dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) /* {{{ if (cloned_node->doc == node->doc) { clone->document = intern->document; } - php_libxml_increment_doc_ref((php_libxml_node_object *)clone, cloned_node->doc TSRMLS_CC); - php_libxml_increment_node_ptr((php_libxml_node_object *)clone, cloned_node, (void *)clone TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)clone, cloned_node->doc); + php_libxml_increment_node_ptr((php_libxml_node_object *)clone, cloned_node, (void *)clone); if (intern->document != clone->document) { dom_copy_doc_props(intern->document, clone->document); } @@ -592,12 +592,12 @@ zend_module_entry dom_module_entry = { /* {{{ */ ZEND_GET_MODULE(dom) #endif -void dom_objects_free_storage(zend_object *object TSRMLS_DC); -void dom_nnodemap_objects_free_storage(zend_object *object TSRMLS_DC); -static zend_object *dom_objects_store_clone_obj(zval *zobject TSRMLS_DC); -static void dom_nnodemap_object_dtor(zend_object *object TSRMLS_DC); +void dom_objects_free_storage(zend_object *object); +void dom_nnodemap_objects_free_storage(zend_object *object); +static zend_object *dom_objects_store_clone_obj(zval *zobject); +static void dom_nnodemap_object_dtor(zend_object *object); #if defined(LIBXML_XPATH_ENABLED) -void dom_xpath_objects_free_storage(zend_object *object TSRMLS_DC); +void dom_xpath_objects_free_storage(zend_object *object); #endif /* {{{ PHP_MINIT_FUNCTION(dom) */ @@ -625,26 +625,26 @@ PHP_MINIT_FUNCTION(dom) zend_hash_init(&classes, 0, NULL, NULL, 1); INIT_CLASS_ENTRY(ce, "DOMException", php_dom_domexception_class_functions); - dom_domexception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C) TSRMLS_CC); + dom_domexception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default()); dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL; - zend_declare_property_long(dom_domexception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_long(dom_domexception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PUBLIC); REGISTER_DOM_CLASS(ce, "DOMStringList", NULL, php_dom_domstringlist_class_functions, dom_domstringlist_class_entry); zend_hash_init(&dom_domstringlist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_domstringlist_prop_handlers, "length", dom_domstringlist_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_domstringlist_prop_handlers, "length", dom_domstringlist_length_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_domstringlist_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMNameList", NULL, php_dom_namelist_class_functions, dom_namelist_class_entry); zend_hash_init(&dom_namelist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_namelist_prop_handlers, "length", dom_namelist_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_namelist_prop_handlers, "length", dom_namelist_length_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_namelist_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMImplementationList", NULL, php_dom_domimplementationlist_class_functions, dom_domimplementationlist_class_entry); zend_hash_init(&dom_domimplementationlist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_domimplementationlist_prop_handlers, "length", dom_domimplementationlist_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_domimplementationlist_prop_handlers, "length", dom_domimplementationlist_length_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_domimplementationlist_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMImplementationSource", NULL, php_dom_domimplementationsource_class_functions, dom_domimplementationsource_class_entry); @@ -653,35 +653,35 @@ PHP_MINIT_FUNCTION(dom) REGISTER_DOM_CLASS(ce, "DOMNode", NULL, php_dom_node_class_functions, dom_node_class_entry); zend_hash_init(&dom_node_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_node_prop_handlers, "nodeName", dom_node_node_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "nodeValue", dom_node_node_value_read, dom_node_node_value_write TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "nodeType", dom_node_node_type_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "parentNode", dom_node_parent_node_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "childNodes", dom_node_child_nodes_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "firstChild", dom_node_first_child_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "lastChild", dom_node_last_child_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "previousSibling", dom_node_previous_sibling_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "nextSibling", dom_node_next_sibling_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "attributes", dom_node_attributes_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "ownerDocument", dom_node_owner_document_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "namespaceURI", dom_node_namespace_uri_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "prefix", dom_node_prefix_read, dom_node_prefix_write TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "localName", dom_node_local_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "baseURI", dom_node_base_uri_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_node_prop_handlers, "textContent", dom_node_text_content_read, dom_node_text_content_write TSRMLS_CC); + dom_register_prop_handler(&dom_node_prop_handlers, "nodeName", dom_node_node_name_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "nodeValue", dom_node_node_value_read, dom_node_node_value_write); + dom_register_prop_handler(&dom_node_prop_handlers, "nodeType", dom_node_node_type_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "parentNode", dom_node_parent_node_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "childNodes", dom_node_child_nodes_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "firstChild", dom_node_first_child_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "lastChild", dom_node_last_child_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "previousSibling", dom_node_previous_sibling_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "nextSibling", dom_node_next_sibling_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "attributes", dom_node_attributes_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "ownerDocument", dom_node_owner_document_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "namespaceURI", dom_node_namespace_uri_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "prefix", dom_node_prefix_read, dom_node_prefix_write); + dom_register_prop_handler(&dom_node_prop_handlers, "localName", dom_node_local_name_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "baseURI", dom_node_base_uri_read, NULL); + dom_register_prop_handler(&dom_node_prop_handlers, "textContent", dom_node_text_content_read, dom_node_text_content_write); zend_hash_add_ptr(&classes, ce.name, &dom_node_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMNameSpaceNode", NULL, NULL, dom_namespace_node_class_entry); zend_hash_init(&dom_namespace_node_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeName", dom_node_node_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeValue", dom_node_node_value_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeType", dom_node_node_type_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "prefix", dom_node_prefix_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "localName", dom_node_local_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "namespaceURI", dom_node_namespace_uri_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "ownerDocument", dom_node_owner_document_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_namespace_node_prop_handlers, "parentNode", dom_node_parent_node_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeName", dom_node_node_name_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeValue", dom_node_node_value_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeType", dom_node_node_type_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "prefix", dom_node_prefix_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "localName", dom_node_local_name_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "namespaceURI", dom_node_namespace_uri_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "ownerDocument", dom_node_owner_document_read, NULL); + dom_register_prop_handler(&dom_namespace_node_prop_handlers, "parentNode", dom_node_parent_node_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_namespace_node_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMDocumentFragment", dom_node_class_entry, php_dom_documentfragment_class_functions, dom_documentfragment_class_entry); @@ -689,80 +689,80 @@ PHP_MINIT_FUNCTION(dom) REGISTER_DOM_CLASS(ce, "DOMDocument", dom_node_class_entry, php_dom_document_class_functions, dom_document_class_entry); zend_hash_init(&dom_document_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_document_prop_handlers, "doctype", dom_document_doctype_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "implementation", dom_document_implementation_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "documentElement", dom_document_document_element_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "actualEncoding", dom_document_encoding_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "encoding", dom_document_encoding_read, dom_document_encoding_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "xmlEncoding", dom_document_encoding_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "standalone", dom_document_standalone_read, dom_document_standalone_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "xmlStandalone", dom_document_standalone_read, dom_document_standalone_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "version", dom_document_version_read, dom_document_version_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "xmlVersion", dom_document_version_read, dom_document_version_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "strictErrorChecking", dom_document_strict_error_checking_read, dom_document_strict_error_checking_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "documentURI", dom_document_document_uri_read, dom_document_document_uri_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "config", dom_document_config_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "formatOutput", dom_document_format_output_read, dom_document_format_output_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "validateOnParse", dom_document_validate_on_parse_read, dom_document_validate_on_parse_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "resolveExternals", dom_document_resolve_externals_read, dom_document_resolve_externals_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "preserveWhiteSpace", dom_document_preserve_whitespace_read, dom_document_preserve_whitespace_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "recover", dom_document_recover_read, dom_document_recover_write TSRMLS_CC); - dom_register_prop_handler(&dom_document_prop_handlers, "substituteEntities", dom_document_substitue_entities_read, dom_document_substitue_entities_write TSRMLS_CC); + dom_register_prop_handler(&dom_document_prop_handlers, "doctype", dom_document_doctype_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "implementation", dom_document_implementation_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "documentElement", dom_document_document_element_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "actualEncoding", dom_document_encoding_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "encoding", dom_document_encoding_read, dom_document_encoding_write); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlEncoding", dom_document_encoding_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "standalone", dom_document_standalone_read, dom_document_standalone_write); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlStandalone", dom_document_standalone_read, dom_document_standalone_write); + dom_register_prop_handler(&dom_document_prop_handlers, "version", dom_document_version_read, dom_document_version_write); + dom_register_prop_handler(&dom_document_prop_handlers, "xmlVersion", dom_document_version_read, dom_document_version_write); + dom_register_prop_handler(&dom_document_prop_handlers, "strictErrorChecking", dom_document_strict_error_checking_read, dom_document_strict_error_checking_write); + dom_register_prop_handler(&dom_document_prop_handlers, "documentURI", dom_document_document_uri_read, dom_document_document_uri_write); + dom_register_prop_handler(&dom_document_prop_handlers, "config", dom_document_config_read, NULL); + dom_register_prop_handler(&dom_document_prop_handlers, "formatOutput", dom_document_format_output_read, dom_document_format_output_write); + dom_register_prop_handler(&dom_document_prop_handlers, "validateOnParse", dom_document_validate_on_parse_read, dom_document_validate_on_parse_write); + dom_register_prop_handler(&dom_document_prop_handlers, "resolveExternals", dom_document_resolve_externals_read, dom_document_resolve_externals_write); + dom_register_prop_handler(&dom_document_prop_handlers, "preserveWhiteSpace", dom_document_preserve_whitespace_read, dom_document_preserve_whitespace_write); + dom_register_prop_handler(&dom_document_prop_handlers, "recover", dom_document_recover_read, dom_document_recover_write); + dom_register_prop_handler(&dom_document_prop_handlers, "substituteEntities", dom_document_substitue_entities_read, dom_document_substitue_entities_write); zend_hash_merge(&dom_document_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_document_prop_handlers); INIT_CLASS_ENTRY(ce, "DOMNodeList", php_dom_nodelist_class_functions); ce.create_object = dom_nnodemap_objects_new; - dom_nodelist_class_entry = zend_register_internal_class_ex(&ce, NULL TSRMLS_CC); + dom_nodelist_class_entry = zend_register_internal_class_ex(&ce, NULL); dom_nodelist_class_entry->get_iterator = php_dom_get_iterator; - zend_class_implements(dom_nodelist_class_entry TSRMLS_CC, 1, zend_ce_traversable); + zend_class_implements(dom_nodelist_class_entry, 1, zend_ce_traversable); zend_hash_init(&dom_nodelist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_nodelist_prop_handlers, "length", dom_nodelist_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_nodelist_prop_handlers, "length", dom_nodelist_length_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_nodelist_prop_handlers); INIT_CLASS_ENTRY(ce, "DOMNamedNodeMap", php_dom_namednodemap_class_functions); ce.create_object = dom_nnodemap_objects_new; - dom_namednodemap_class_entry = zend_register_internal_class_ex(&ce, NULL TSRMLS_CC); + dom_namednodemap_class_entry = zend_register_internal_class_ex(&ce, NULL); dom_namednodemap_class_entry->get_iterator = php_dom_get_iterator; - zend_class_implements(dom_namednodemap_class_entry TSRMLS_CC, 1, zend_ce_traversable); + zend_class_implements(dom_namednodemap_class_entry, 1, zend_ce_traversable); zend_hash_init(&dom_namednodemap_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_namednodemap_prop_handlers, "length", dom_namednodemap_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_namednodemap_prop_handlers, "length", dom_namednodemap_length_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_namednodemap_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMCharacterData", dom_node_class_entry, php_dom_characterdata_class_functions, dom_characterdata_class_entry); zend_hash_init(&dom_characterdata_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_characterdata_prop_handlers, "data", dom_characterdata_data_read, dom_characterdata_data_write TSRMLS_CC); - dom_register_prop_handler(&dom_characterdata_prop_handlers, "length", dom_characterdata_length_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_characterdata_prop_handlers, "data", dom_characterdata_data_read, dom_characterdata_data_write); + dom_register_prop_handler(&dom_characterdata_prop_handlers, "length", dom_characterdata_length_read, NULL); zend_hash_merge(&dom_characterdata_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_characterdata_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMAttr", dom_node_class_entry, php_dom_attr_class_functions, dom_attr_class_entry); zend_hash_init(&dom_attr_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_attr_prop_handlers, "name", dom_attr_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_attr_prop_handlers, "specified", dom_attr_specified_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_attr_prop_handlers, "value", dom_attr_value_read, dom_attr_value_write TSRMLS_CC); - dom_register_prop_handler(&dom_attr_prop_handlers, "ownerElement", dom_attr_owner_element_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_attr_prop_handlers, "schemaTypeInfo", dom_attr_schema_type_info_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_attr_prop_handlers, "name", dom_attr_name_read, NULL); + dom_register_prop_handler(&dom_attr_prop_handlers, "specified", dom_attr_specified_read, NULL); + dom_register_prop_handler(&dom_attr_prop_handlers, "value", dom_attr_value_read, dom_attr_value_write); + dom_register_prop_handler(&dom_attr_prop_handlers, "ownerElement", dom_attr_owner_element_read, NULL); + dom_register_prop_handler(&dom_attr_prop_handlers, "schemaTypeInfo", dom_attr_schema_type_info_read, NULL); zend_hash_merge(&dom_attr_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_attr_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMElement", dom_node_class_entry, php_dom_element_class_functions, dom_element_class_entry); zend_hash_init(&dom_element_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_element_prop_handlers, "tagName", dom_element_tag_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_element_prop_handlers, "schemaTypeInfo", dom_element_schema_type_info_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_element_prop_handlers, "tagName", dom_element_tag_name_read, NULL); + dom_register_prop_handler(&dom_element_prop_handlers, "schemaTypeInfo", dom_element_schema_type_info_read, NULL); zend_hash_merge(&dom_element_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_element_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMText", dom_characterdata_class_entry, php_dom_text_class_functions, dom_text_class_entry); zend_hash_init(&dom_text_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_text_prop_handlers, "wholeText", dom_text_whole_text_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_text_prop_handlers, "wholeText", dom_text_whole_text_read, NULL); zend_hash_merge(&dom_text_prop_handlers, &dom_characterdata_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_text_prop_handlers); @@ -772,31 +772,31 @@ PHP_MINIT_FUNCTION(dom) REGISTER_DOM_CLASS(ce, "DOMTypeinfo", NULL, php_dom_typeinfo_class_functions, dom_typeinfo_class_entry); zend_hash_init(&dom_typeinfo_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_typeinfo_prop_handlers, "typeName", dom_typeinfo_type_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_typeinfo_prop_handlers, "typeNamespace", dom_typeinfo_type_namespace_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_typeinfo_prop_handlers, "typeName", dom_typeinfo_type_name_read, NULL); + dom_register_prop_handler(&dom_typeinfo_prop_handlers, "typeNamespace", dom_typeinfo_type_namespace_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_typeinfo_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMUserDataHandler", NULL, php_dom_userdatahandler_class_functions, dom_userdatahandler_class_entry); REGISTER_DOM_CLASS(ce, "DOMDomError", NULL, php_dom_domerror_class_functions, dom_domerror_class_entry); zend_hash_init(&dom_domerror_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_domerror_prop_handlers, "severity", dom_domerror_severity_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domerror_prop_handlers, "message", dom_domerror_message_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domerror_prop_handlers, "type", dom_domerror_type_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domerror_prop_handlers, "relatedException", dom_domerror_related_exception_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domerror_prop_handlers, "related_data", dom_domerror_related_data_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domerror_prop_handlers, "location", dom_domerror_location_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_domerror_prop_handlers, "severity", dom_domerror_severity_read, NULL); + dom_register_prop_handler(&dom_domerror_prop_handlers, "message", dom_domerror_message_read, NULL); + dom_register_prop_handler(&dom_domerror_prop_handlers, "type", dom_domerror_type_read, NULL); + dom_register_prop_handler(&dom_domerror_prop_handlers, "relatedException", dom_domerror_related_exception_read, NULL); + dom_register_prop_handler(&dom_domerror_prop_handlers, "related_data", dom_domerror_related_data_read, NULL); + dom_register_prop_handler(&dom_domerror_prop_handlers, "location", dom_domerror_location_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_domerror_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMErrorHandler", NULL, php_dom_domerrorhandler_class_functions, dom_domerrorhandler_class_entry); REGISTER_DOM_CLASS(ce, "DOMLocator", NULL, php_dom_domlocator_class_functions, dom_domlocator_class_entry); zend_hash_init(&dom_domlocator_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_domlocator_prop_handlers, "lineNumber", dom_domlocator_line_number_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domlocator_prop_handlers, "columnNumber", dom_domlocator_column_number_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domlocator_prop_handlers, "offset", dom_domlocator_offset_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domlocator_prop_handlers, "relatedNode", dom_domlocator_related_node_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_domlocator_prop_handlers, "uri", dom_domlocator_uri_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_domlocator_prop_handlers, "lineNumber", dom_domlocator_line_number_read, NULL); + dom_register_prop_handler(&dom_domlocator_prop_handlers, "columnNumber", dom_domlocator_column_number_read, NULL); + dom_register_prop_handler(&dom_domlocator_prop_handlers, "offset", dom_domlocator_offset_read, NULL); + dom_register_prop_handler(&dom_domlocator_prop_handlers, "relatedNode", dom_domlocator_related_node_read, NULL); + dom_register_prop_handler(&dom_domlocator_prop_handlers, "uri", dom_domlocator_uri_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_domlocator_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMConfiguration", NULL, php_dom_domconfiguration_class_functions, dom_domconfiguration_class_entry); @@ -806,32 +806,32 @@ PHP_MINIT_FUNCTION(dom) REGISTER_DOM_CLASS(ce, "DOMDocumentType", dom_node_class_entry, php_dom_documenttype_class_functions, dom_documenttype_class_entry); zend_hash_init(&dom_documenttype_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "name", dom_documenttype_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "entities", dom_documenttype_entities_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "notations", dom_documenttype_notations_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "publicId", dom_documenttype_public_id_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "systemId", dom_documenttype_system_id_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_documenttype_prop_handlers, "internalSubset", dom_documenttype_internal_subset_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "name", dom_documenttype_name_read, NULL); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "entities", dom_documenttype_entities_read, NULL); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "notations", dom_documenttype_notations_read, NULL); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "publicId", dom_documenttype_public_id_read, NULL); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "systemId", dom_documenttype_system_id_read, NULL); + dom_register_prop_handler(&dom_documenttype_prop_handlers, "internalSubset", dom_documenttype_internal_subset_read, NULL); zend_hash_merge(&dom_documenttype_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_documenttype_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMNotation", dom_node_class_entry, php_dom_notation_class_functions, dom_notation_class_entry); zend_hash_init(&dom_notation_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_notation_prop_handlers, "publicId", dom_notation_public_id_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_notation_prop_handlers, "systemId", dom_notation_system_id_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_notation_prop_handlers, "publicId", dom_notation_public_id_read, NULL); + dom_register_prop_handler(&dom_notation_prop_handlers, "systemId", dom_notation_system_id_read, NULL); zend_hash_merge(&dom_notation_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_notation_prop_handlers); REGISTER_DOM_CLASS(ce, "DOMEntity", dom_node_class_entry, php_dom_entity_class_functions, dom_entity_class_entry); zend_hash_init(&dom_entity_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_entity_prop_handlers, "publicId", dom_entity_public_id_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_entity_prop_handlers, "systemId", dom_entity_system_id_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_entity_prop_handlers, "notationName", dom_entity_notation_name_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_entity_prop_handlers, "actualEncoding", dom_entity_actual_encoding_read, dom_entity_actual_encoding_write TSRMLS_CC); - dom_register_prop_handler(&dom_entity_prop_handlers, "encoding", dom_entity_encoding_read, dom_entity_encoding_write TSRMLS_CC); - dom_register_prop_handler(&dom_entity_prop_handlers, "version", dom_entity_version_read, dom_entity_version_write TSRMLS_CC); + dom_register_prop_handler(&dom_entity_prop_handlers, "publicId", dom_entity_public_id_read, NULL); + dom_register_prop_handler(&dom_entity_prop_handlers, "systemId", dom_entity_system_id_read, NULL); + dom_register_prop_handler(&dom_entity_prop_handlers, "notationName", dom_entity_notation_name_read, NULL); + dom_register_prop_handler(&dom_entity_prop_handlers, "actualEncoding", dom_entity_actual_encoding_read, dom_entity_actual_encoding_write); + dom_register_prop_handler(&dom_entity_prop_handlers, "encoding", dom_entity_encoding_read, dom_entity_encoding_write); + dom_register_prop_handler(&dom_entity_prop_handlers, "version", dom_entity_version_read, dom_entity_version_write); zend_hash_merge(&dom_entity_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_entity_prop_handlers); @@ -841,8 +841,8 @@ PHP_MINIT_FUNCTION(dom) REGISTER_DOM_CLASS(ce, "DOMProcessingInstruction", dom_node_class_entry, php_dom_processinginstruction_class_functions, dom_processinginstruction_class_entry); zend_hash_init(&dom_processinginstruction_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_processinginstruction_prop_handlers, "target", dom_processinginstruction_target_read, NULL TSRMLS_CC); - dom_register_prop_handler(&dom_processinginstruction_prop_handlers, "data", dom_processinginstruction_data_read, dom_processinginstruction_data_write TSRMLS_CC); + dom_register_prop_handler(&dom_processinginstruction_prop_handlers, "target", dom_processinginstruction_target_read, NULL); + dom_register_prop_handler(&dom_processinginstruction_prop_handlers, "data", dom_processinginstruction_data_read, dom_processinginstruction_data_write); zend_hash_merge(&dom_processinginstruction_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_processinginstruction_prop_handlers); @@ -855,10 +855,10 @@ PHP_MINIT_FUNCTION(dom) INIT_CLASS_ENTRY(ce, "DOMXPath", php_dom_xpath_class_functions); ce.create_object = dom_xpath_objects_new; - dom_xpath_class_entry = zend_register_internal_class_ex(&ce, NULL TSRMLS_CC); + dom_xpath_class_entry = zend_register_internal_class_ex(&ce, NULL); zend_hash_init(&dom_xpath_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_xpath_prop_handlers, "document", dom_xpath_document_read, NULL TSRMLS_CC); + dom_register_prop_handler(&dom_xpath_prop_handlers, "document", dom_xpath_document_read, NULL); zend_hash_add_ptr(&classes, ce.name, &dom_xpath_prop_handlers); #endif @@ -979,7 +979,7 @@ PHP_MSHUTDOWN_FUNCTION(dom) /* {{{ */ /* }}} */ /* {{{ node_list_unlink */ -void node_list_unlink(xmlNodePtr node TSRMLS_DC) +void node_list_unlink(xmlNodePtr node) { dom_object *wrapper; @@ -992,7 +992,7 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC) } else { if (node->type == XML_ENTITY_REF_NODE) break; - node_list_unlink(node->children TSRMLS_CC); + node_list_unlink(node->children); switch (node->type) { case XML_ATTRIBUTE_DECL: @@ -1003,7 +1003,7 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC) case XML_TEXT_NODE: break; default: - node_list_unlink((xmlNodePtr) node->properties TSRMLS_CC); + node_list_unlink((xmlNodePtr) node->properties); } } @@ -1015,15 +1015,15 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC) #if defined(LIBXML_XPATH_ENABLED) /* {{{ dom_xpath_objects_free_storage */ -void dom_xpath_objects_free_storage(zend_object *object TSRMLS_DC) +void dom_xpath_objects_free_storage(zend_object *object) { dom_xpath_object *intern = php_xpath_obj_from_obj(object); - zend_object_std_dtor(&intern->dom.std TSRMLS_CC); + zend_object_std_dtor(&intern->dom.std); if (intern->dom.ptr != NULL) { xmlXPathFreeContext((xmlXPathContextPtr) intern->dom.ptr); - php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom TSRMLS_CC); + php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom); } if (intern->registered_phpfunctions) { @@ -1040,7 +1040,7 @@ void dom_xpath_objects_free_storage(zend_object *object TSRMLS_DC) #endif /* {{{ dom_objects_free_storage */ -void dom_objects_free_storage(zend_object *object TSRMLS_DC) +void dom_objects_free_storage(zend_object *object) { dom_object *intern = php_dom_obj_from_obj(object); #if defined(__GNUC__) && __GNUC__ >= 3 @@ -1049,21 +1049,21 @@ void dom_objects_free_storage(zend_object *object TSRMLS_DC) int retcount; #endif - zend_object_std_dtor(&intern->std TSRMLS_CC); + zend_object_std_dtor(&intern->std); if (intern->ptr != NULL && ((php_libxml_node_ptr *)intern->ptr)->node != NULL) { if (((xmlNodePtr) ((php_libxml_node_ptr *)intern->ptr)->node)->type != XML_DOCUMENT_NODE && ((xmlNodePtr) ((php_libxml_node_ptr *)intern->ptr)->node)->type != XML_HTML_DOCUMENT_NODE) { - php_libxml_node_decrement_resource((php_libxml_node_object *) intern TSRMLS_CC); + php_libxml_node_decrement_resource((php_libxml_node_object *) intern); } else { - php_libxml_decrement_node_ptr((php_libxml_node_object *) intern TSRMLS_CC); - retcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern TSRMLS_CC); + php_libxml_decrement_node_ptr((php_libxml_node_object *) intern); + retcount = php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); } intern->ptr = NULL; } } /* }}} */ -void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC) /* {{{ */ +void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns) /* {{{ */ { dom_nnodemap_object *mapptr = (dom_nnodemap_object *) intern->ptr; @@ -1079,7 +1079,7 @@ void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xml } /* }}} */ -static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC) /* {{{ */ +static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy) /* {{{ */ { dom_object *intern = ecalloc(1, sizeof(dom_object) + sizeof(zval) * (class_type->default_properties_count - 1)); @@ -1090,7 +1090,7 @@ static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool intern->prop_handler = zend_hash_find_ptr(&classes, base_class->name); - zend_object_std_init(&intern->std, class_type TSRMLS_CC); + zend_object_std_init(&intern->std, class_type); if (hash_copy) { object_properties_init(&intern->std, class_type); } @@ -1100,17 +1100,17 @@ static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool /* }}} */ /* {{{ dom_objects_new */ -zend_object *dom_objects_new(zend_class_entry *class_type TSRMLS_DC) +zend_object *dom_objects_new(zend_class_entry *class_type) { - dom_object *intern = dom_objects_set_class(class_type, 1 TSRMLS_CC); - intern->std.handlers = dom_get_obj_handlers(TSRMLS_C); + dom_object *intern = dom_objects_set_class(class_type, 1); + intern->std.handlers = dom_get_obj_handlers(); return &intern->std; } /* }}} */ #if defined(LIBXML_XPATH_ENABLED) -/* {{{ zend_object_value dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC) */ -zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC) +/* {{{ zend_object_value dom_xpath_objects_new(zend_class_entry *class_type) */ +zend_object *dom_xpath_objects_new(zend_class_entry *class_type) { dom_xpath_object *intern = ecalloc(1, sizeof(dom_xpath_object) + sizeof(zval) * (class_type->default_properties_count - 1)); @@ -1120,7 +1120,7 @@ zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC) intern->dom.prop_handler = &dom_xpath_prop_handlers; intern->dom.std.handlers = &dom_xpath_object_handlers; - zend_object_std_init(&intern->dom.std, class_type TSRMLS_CC); + zend_object_std_init(&intern->dom.std, class_type); object_properties_init(&intern->dom.std, class_type); return &intern->dom.std; @@ -1128,7 +1128,7 @@ zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC) /* }}} */ #endif -static void dom_nnodemap_object_dtor(zend_object *object TSRMLS_DC) /* {{{ */ +static void dom_nnodemap_object_dtor(zend_object *object) /* {{{ */ { dom_object *intern; dom_nnodemap_object *objmap; @@ -1152,22 +1152,22 @@ static void dom_nnodemap_object_dtor(zend_object *object TSRMLS_DC) /* {{{ */ } /* }}} */ -void dom_nnodemap_objects_free_storage(zend_object *object TSRMLS_DC) /* {{{ */ +void dom_nnodemap_objects_free_storage(zend_object *object) /* {{{ */ { dom_object *intern = php_dom_obj_from_obj(object); - php_libxml_decrement_doc_ref((php_libxml_node_object *)intern TSRMLS_CC); + php_libxml_decrement_doc_ref((php_libxml_node_object *)intern); - zend_object_std_dtor(&intern->std TSRMLS_CC); + zend_object_std_dtor(&intern->std); } /* }}} */ -zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ +zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type) /* {{{ */ { dom_object *intern; dom_nnodemap_object *objmap; - intern = dom_objects_set_class(class_type, 1 TSRMLS_CC); + intern = dom_objects_set_class(class_type, 1); intern->ptr = emalloc(sizeof(dom_nnodemap_object)); objmap = (dom_nnodemap_object *)intern->ptr; ZVAL_UNDEF(&objmap->baseobj_zv); @@ -1183,7 +1183,7 @@ zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) /* } /* }}} */ -void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) /* {{{ */ +void php_dom_create_interator(zval *return_value, int ce_type) /* {{{ */ { zend_class_entry *ce; @@ -1198,7 +1198,7 @@ void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) /* {{{ /* }}} */ /* {{{ php_dom_create_object */ -PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval *return_value, dom_object *domobj TSRMLS_DC) +PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval *return_value, dom_object *domobj) { zend_class_entry *ce; dom_object *intern; @@ -1284,13 +1284,13 @@ PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval *return_valu break; } default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported node type: %d", obj->type); + php_error_docref(NULL, E_WARNING, "Unsupported node type: %d", obj->type); ZVAL_NULL(return_value); return 0; } if (domobj && domobj->document) { - ce = dom_get_doc_classmap(domobj->document, ce TSRMLS_CC); + ce = dom_get_doc_classmap(domobj->document, ce); } object_init_ex(return_value, ce); @@ -1299,15 +1299,15 @@ PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval *return_valu if (domobj != NULL) { intern->document = domobj->document; } - php_libxml_increment_doc_ref((php_libxml_node_object *)intern, obj->doc TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *)intern, obj->doc); } - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, obj, (void *)intern TSRMLS_CC); + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, obj, (void *)intern); return 0; } /* }}} end php_domobject_new */ -void php_dom_create_implementation(zval *retval TSRMLS_DC) { +void php_dom_create_implementation(zval *retval) { object_init_ex(retval, dom_domimplementation_class_entry); } @@ -1374,8 +1374,8 @@ xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *l /* }}} */ /* }}} end dom_element_get_elements_by_tag_name_ns_raw */ -/* {{{ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) */ -void dom_normalize (xmlNodePtr nodep TSRMLS_DC) +/* {{{ void dom_normalize (xmlNodePtr nodep) */ +void dom_normalize (xmlNodePtr nodep) { xmlNodePtr child, nextp, newnextp; xmlAttrPtr attr; @@ -1393,7 +1393,7 @@ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) xmlNodeAddContent(child, strContent); xmlFree(strContent); xmlUnlinkNode(nextp); - php_libxml_node_free_resource(nextp TSRMLS_CC); + php_libxml_node_free_resource(nextp); nextp = newnextp; } else { break; @@ -1401,15 +1401,15 @@ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) } break; case XML_ELEMENT_NODE: - dom_normalize (child TSRMLS_CC); + dom_normalize (child); attr = child->properties; while (attr != NULL) { - dom_normalize((xmlNodePtr) attr TSRMLS_CC); + dom_normalize((xmlNodePtr) attr); attr = attr->next; } break; case XML_ATTRIBUTE_NODE: - dom_normalize (child TSRMLS_CC); + dom_normalize (child); break; default: break; @@ -1544,7 +1544,7 @@ xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName) { } /* }}} end dom_get_nsdecl */ -zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv TSRMLS_DC) /* {{{ */ +zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv) /* {{{ */ { zval offset_copy; @@ -1559,14 +1559,14 @@ zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv return rv; } /* }}} end dom_nodelist_read_dimension */ -int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty TSRMLS_DC) +int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty) { zend_long offset = zval_get_long(member); if (offset < 0) { return 0; } else { - zval *length = zend_read_property(Z_OBJCE_P(object), object, "length", sizeof("length") - 1, 0 TSRMLS_CC); + zval *length = zend_read_property(Z_OBJCE_P(object), object, "length", sizeof("length") - 1, 0); return length && offset < Z_LVAL_P(length); } diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 02eb2d9509..bb4aa160e6 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -99,45 +99,45 @@ typedef struct { dom_object *dom_object_get_data(xmlNodePtr obj); dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document); -zend_object *dom_objects_new(zend_class_entry *class_type TSRMLS_DC); -zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_objects_new(zend_class_entry *class_type); +zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type); #if defined(LIBXML_XPATH_ENABLED) -zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_xpath_objects_new(zend_class_entry *class_type); #endif int dom_get_strict_error(php_libxml_ref_obj *document); -void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC); -void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC); -void node_list_unlink(xmlNodePtr node TSRMLS_DC); +void php_dom_throw_error(int error_code, int strict_error); +void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error); +void node_list_unlink(xmlNodePtr node); int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len, int name_len); xmlNsPtr dom_get_ns(xmlNodePtr node, char *uri, int *errorcode, char *prefix); void dom_set_old_ns(xmlDoc *doc, xmlNs *ns); xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName); -void dom_normalize (xmlNodePtr nodep TSRMLS_DC); +void dom_normalize (xmlNodePtr nodep); xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index); -void php_dom_create_implementation(zval *retval TSRMLS_DC); +void php_dom_create_implementation(zval *retval); int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child); int dom_has_feature(char *feature, char *version); int dom_node_is_read_only(xmlNodePtr node); int dom_node_children_valid(xmlNodePtr node); -void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC); -void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC); +void php_dom_create_interator(zval *return_value, int ce_type); +void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns); xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index); xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index); -zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); -int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce TSRMLS_DC); -zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv TSRMLS_DC); -int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty TSRMLS_DC); +zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref); +int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce); +zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv); +int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty); #define REGISTER_DOM_CLASS(ce, name, parent_ce, funcs, entry) \ INIT_CLASS_ENTRY(ce, name, funcs); \ ce.create_object = dom_objects_new; \ -entry = zend_register_internal_class_ex(&ce, parent_ce TSRMLS_CC); +entry = zend_register_internal_class_ex(&ce, parent_ce); #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = Z_DOMOBJ_P(__id); \ if (__intern->ptr == NULL || !(__ptr = (__prtype)((php_libxml_node_ptr *)__intern->ptr)->node)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name->val);\ + php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name->val);\ RETURN_NULL();\ } \ } @@ -148,7 +148,7 @@ entry = zend_register_internal_class_ex(&ce, parent_ce TSRMLS_CC); } #define DOM_NOT_IMPLEMENTED() \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not yet implemented"); \ + php_error_docref(NULL, E_WARNING, "Not yet implemented"); \ return; #define DOM_NODELIST 0 diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index a42cc9508b..df66fb0bef 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -58,33 +58,33 @@ PHP_METHOD(domprocessinginstruction, __construct) int name_valid; 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(), "Os|s", &id, dom_processinginstruction_class_entry, &name, &name_len, &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(), "Os|s", &id, dom_processinginstruction_class_entry, &name, &name_len, &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); name_valid = xmlValidateName((xmlChar *) name, 0); if (name_valid != 0) { - php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_CHARACTER_ERR, 1); RETURN_FALSE; } nodep = xmlNewPI((xmlChar *) name, (xmlChar *) value); if (!nodep) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } intern = Z_DOMOBJ_P(id); 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 DOMProcessingInstruction::__construct */ @@ -93,12 +93,12 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1478689192 Since: */ -int dom_processinginstruction_target_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_processinginstruction_target_read(dom_object *obj, zval *retval) { xmlNodePtr nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -114,7 +114,7 @@ readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393 Since: */ -int dom_processinginstruction_data_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_processinginstruction_data_read(dom_object *obj, zval *retval) { xmlNodePtr nodep; xmlChar *content; @@ -122,7 +122,7 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval TSRMLS_DC) nodep = dom_object_get_node(obj); if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } @@ -136,13 +136,13 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval TSRMLS_DC) return SUCCESS; } -int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC) +int dom_processinginstruction_data_write(dom_object *obj, zval *newval) { xmlNode *nodep = dom_object_get_node(obj); zend_string *str; if (nodep == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 0); return FAILURE; } 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); diff --git a/ext/dom/typeinfo.c b/ext/dom/typeinfo.c index 5267ee6f77..49dddfafcd 100644 --- a/ext/dom/typeinfo.c +++ b/ext/dom/typeinfo.c @@ -46,7 +46,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeName Since: */ -int dom_typeinfo_type_name_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_typeinfo_type_name_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; @@ -59,7 +59,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeNamespace Since: */ -int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval) { ZVAL_NULL(retval); return SUCCESS; diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index 9d5ffe8fb6..9fad36d005 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -59,7 +59,7 @@ static inline dom_object *php_dom_obj_from_obj(zend_object *obj) { PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry; PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj); -PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval* return_value, dom_object *domobj TSRMLS_DC); +PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval* return_value, dom_object *domobj); PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); #define DOM_XMLNS_NAMESPACE \ @@ -68,7 +68,7 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = Z_LIBXML_NODE_P(__id); \ if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", \ + php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \ __intern->std.ce->name->val);\ RETURN_NULL();\ } \ @@ -78,18 +78,18 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); __intern = Z_LIBXML_NODE_P(__id); \ if (__intern->document != NULL) { \ if (!(__ptr = (__prtype)__intern->document->ptr)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ } \ } #define DOM_RET_OBJ(obj, ret, domobject) \ - *ret = php_dom_create_object(obj, return_value, domobject TSRMLS_CC) + *ret = php_dom_create_object(obj, return_value, domobject) #define DOM_GET_THIS(zval) \ if (NULL == (zval = getThis())) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \ + php_error_docref(NULL, E_WARNING, "Underlying object missing"); \ RETURN_FALSE; \ } diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 336365e342..c957916156 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -83,9 +83,8 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, zend_string *callable = NULL; dom_xpath_object *intern; - TSRMLS_FETCH(); - if (! zend_is_executing(TSRMLS_C)) { + if (! zend_is_executing()) { xmlGenericError(xmlGenericErrorContext, "xmlExtFunctionTest: Function called from outside of PHP\n"); error = 1; @@ -159,7 +158,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, node->parent = nsparent; node->ns = curns; } - php_dom_create_object(node, &child, &intern->dom TSRMLS_CC); + php_dom_create_object(node, &child, &intern->dom); add_next_index_zval(&fci.params[i], &child); } } @@ -176,7 +175,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, obj = valuePop(ctxt); if (obj->stringval == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Handler name must be a string"); + php_error_docref(NULL, E_WARNING, "Handler name must be a string"); xmlXPathFreeObject(obj); if (fci.param_count > 0) { for (i = 0; i < nargs - 1; i++) { @@ -194,16 +193,16 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, fci.retval = &retval; fci.no_separation = 0; - if (!zend_make_callable(&fci.function_name, &callable TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", callable->val); + if (!zend_make_callable(&fci.function_name, &callable)) { + php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", callable->val); } else if (intern->registerPhpFunctions == 2 && zend_hash_exists(intern->registered_phpfunctions, callable) == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to call handler '%s()'.", callable->val); + php_error_docref(NULL, E_WARNING, "Not allowed to call handler '%s()'.", callable->val); /* Push an empty string, so that we at least have an xslt result... */ valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { - result = zend_call_function(&fci, NULL TSRMLS_CC); + result = zend_call_function(&fci, NULL); if (result == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { - if (Z_TYPE(retval) == IS_OBJECT && instanceof_function(Z_OBJCE(retval), dom_node_class_entry TSRMLS_CC)) { + if (Z_TYPE(retval) == IS_OBJECT && instanceof_function(Z_OBJCE(retval), dom_node_class_entry)) { xmlNode *nodep; dom_object *obj; if (intern->node_list == NULL) { @@ -218,7 +217,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } else if (Z_TYPE(retval) == IS_FALSE || Z_TYPE(retval) == IS_TRUE) { valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(retval) == IS_TRUE)); } else if (Z_TYPE(retval) == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); + php_error_docref(NULL, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { zend_string *str = zval_get_string(&retval); @@ -261,18 +260,18 @@ PHP_METHOD(domxpath, __construct) xmlXPathContextPtr ctx, oldctx; 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(), "OO", &id, dom_xpath_class_entry, &doc, dom_document_class_entry) == 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(), "OO", &id, dom_xpath_class_entry, &doc, dom_document_class_entry) == FAILURE) { + zend_restore_error_handling(&error_handling); return; } - zend_restore_error_handling(&error_handling TSRMLS_CC); + zend_restore_error_handling(&error_handling); DOM_GET_OBJ(docp, doc, xmlDocPtr, docobj); ctx = xmlXPathNewContext(docp); if (ctx == NULL) { - php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); + php_dom_throw_error(INVALID_STATE_ERR, 1); RETURN_FALSE; } @@ -280,7 +279,7 @@ PHP_METHOD(domxpath, __construct) if (intern != NULL) { oldctx = (xmlXPathContextPtr)intern->dom.ptr; if (oldctx != NULL) { - php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom TSRMLS_CC); + php_libxml_decrement_doc_ref((php_libxml_node_object *) &intern->dom); xmlXPathFreeContext(oldctx); } @@ -294,13 +293,13 @@ PHP_METHOD(domxpath, __construct) intern->dom.ptr = ctx; ctx->userData = (void *)intern; intern->dom.document = docobj->document; - php_libxml_increment_doc_ref((php_libxml_node_object *) &intern->dom, docp TSRMLS_CC); + php_libxml_increment_doc_ref((php_libxml_node_object *) &intern->dom, docp); } } /* }}} end DOMXPath::__construct */ /* {{{ document DOMDocument*/ -int dom_xpath_document_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_xpath_document_read(dom_object *obj, zval *retval) { xmlDoc *docp = NULL; xmlXPathContextPtr ctx = (xmlXPathContextPtr) obj->ptr; @@ -309,7 +308,7 @@ int dom_xpath_document_read(dom_object *obj, zval *retval TSRMLS_DC) docp = (xmlDocPtr) ctx->doc; } - php_dom_create_object((xmlNodePtr) docp, retval, obj TSRMLS_CC); + php_dom_create_object((xmlNodePtr) docp, retval, obj); return SUCCESS; } /* }}} */ @@ -323,7 +322,7 @@ PHP_FUNCTION(dom_xpath_register_ns) dom_xpath_object *intern; unsigned char *prefix, *ns_uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -331,7 +330,7 @@ PHP_FUNCTION(dom_xpath_register_ns) ctxp = (xmlXPathContextPtr) intern->dom.ptr; if (ctxp == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } @@ -365,7 +364,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ xmlNsPtr *ns = NULL; zend_bool register_node_ns = 1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { return; } @@ -373,13 +372,13 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ ctxp = (xmlXPathContextPtr) intern->dom.ptr; if (ctxp == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context"); + php_error_docref(NULL, E_WARNING, "Invalid XPath Context"); RETURN_FALSE; } docp = (xmlDocPtr) ctxp->doc; if (docp == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Document Pointer"); + php_error_docref(NULL, E_WARNING, "Invalid XPath Document Pointer"); RETURN_FALSE; } @@ -392,7 +391,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ } if (nodep && docp != nodep->doc) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node From Wrong Document"); + php_error_docref(NULL, E_WARNING, "Node From Wrong Document"); RETURN_FALSE; } @@ -464,11 +463,11 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ node->parent = nsparent; node->ns = curns; } - php_dom_create_object(node, &child, &intern->dom TSRMLS_CC); + php_dom_create_object(node, &child, &intern->dom); add_next_index_zval(&retval, &child); } } - php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC); + php_dom_create_interator(return_value, DOM_NODELIST); nodeobj = Z_DOMOBJ_P(return_value); dom_xpath_iter(&retval, nodeobj); break; @@ -519,7 +518,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) DOM_GET_THIS(id); - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "a", &array_value) == SUCCESS) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "a", &array_value) == SUCCESS) { intern = Z_XPATHOBJ_P(id); zend_hash_internal_pointer_reset(Z_ARRVAL_P(array_value)); while ((entry = zend_hash_get_current_data(Z_ARRVAL_P(array_value)))) { @@ -532,7 +531,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) intern->registerPhpFunctions = 2; RETURN_TRUE; - } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "S", &name) == SUCCESS) { + } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "S", &name) == SUCCESS) { intern = Z_XPATHOBJ_P(id); ZVAL_LONG(&new_string, 1); |