diff options
Diffstat (limited to 'ext/dom/documentfragment.c')
| -rw-r--r-- | ext/dom/documentfragment.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 6ac86a9119..31d3065f50 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -37,10 +37,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMDocumentFragment extends DOMNode +* class DOMDocumentFragment extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-B63ED1A3 -* Since: +* Since: */ const zend_function_entry php_dom_documentfragment_class_functions[] = { @@ -58,29 +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 = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); - if (intern != NULL) { - oldnode = dom_object_get_node(intern); - if (oldnode != NULL) { - php_libxml_node_free_resource(oldnode TSRMLS_CC); - } - /* php_dom_set_object(intern, nodep TSRMLS_CC); */ - php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC); + intern = Z_DOMOBJ_P(id); + oldnode = dom_object_get_node(intern); + if (oldnode != NULL) { + php_libxml_node_free_resource(oldnode ); } + /* php_dom_set_object(intern, nodep); */ + php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern); } /* }}} end DOMDocumentFragment::__construct */ @@ -124,27 +122,27 @@ PHP_METHOD(domdocumentfragment, appendXML) { xmlNode *nodep; dom_object *intern; char *data = NULL; - int data_len = 0; + size_t data_len = 0; 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; } if (data) { - err = xmlParseBalancedChunkMemory(nodep->doc, NULL, NULL, 0, data, &lst); + err = xmlParseBalancedChunkMemory(nodep->doc, NULL, NULL, 0, (xmlChar *) data, &lst); if (err != 0) { RETURN_FALSE; } - /* Following needed due to bug in libxml2 <= 2.6.14 + /* Following needed due to bug in libxml2 <= 2.6.14 ifdef after next libxml release as bug is fixed in their cvs */ php_dom_xmlSetTreeDoc(lst, nodep->doc); /* End stupid hack */ |