archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Small ext/dom cleanups

Browse source
This commit is contained in:
Nikita Popov 2019-10-29 11:15:08 +01:00
parent 312ecc69d5
commit 504f7ffdd6
6 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/dom/cdatasection.c
View file

@ -58,7 +58,7 @@ PHP_METHOD(domcdatasection, __construct)
if (!nodep) { if (!nodep) {
php_dom_throw_error(INVALID_STATE_ERR, 1); php_dom_throw_error(INVALID_STATE_ERR, 1);
RETURN_FALSE; return;
} }
intern = Z_DOMOBJ_P(ZEND_THIS); intern = Z_DOMOBJ_P(ZEND_THIS);

2
ext/dom/comment.c
View file

@ -58,7 +58,7 @@ PHP_METHOD(domcomment, __construct)
if (!nodep) { if (!nodep) {
php_dom_throw_error(INVALID_STATE_ERR, 1); php_dom_throw_error(INVALID_STATE_ERR, 1);
RETURN_FALSE; return;
} }
intern = Z_DOMOBJ_P(ZEND_THIS); intern = Z_DOMOBJ_P(ZEND_THIS);

3
ext/dom/document.c
View file

@ -1270,7 +1270,7 @@ PHP_METHOD(domdocument, __construct)
if (!docp) { if (!docp) {
php_dom_throw_error(INVALID_STATE_ERR, 1); php_dom_throw_error(INVALID_STATE_ERR, 1);
RETURN_FALSE; return;
} }
if (encoding_len > 0) { if (encoding_len > 0) {
@ -2258,7 +2258,6 @@ PHP_METHOD(domdocument, registerNodeClass)
} }
zend_throw_error(NULL, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name)); zend_throw_error(NULL, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name));
RETURN_FALSE;
} }
/* }}} */ /* }}} */

2
ext/dom/documentfragment.c
View file

@ -59,7 +59,7 @@ PHP_METHOD(domdocumentfragment, __construct)
if (!nodep) { if (!nodep) {
php_dom_throw_error(INVALID_STATE_ERR, 1); php_dom_throw_error(INVALID_STATE_ERR, 1);
RETURN_FALSE; return;
} }
intern = Z_DOMOBJ_P(ZEND_THIS); intern = Z_DOMOBJ_P(ZEND_THIS);

8
ext/dom/element.c
View file

@ -165,7 +165,7 @@ PHP_METHOD(domelement, __construct)
name_valid = xmlValidateName((xmlChar *) name, 0); name_valid = xmlValidateName((xmlChar *) name, 0);
if (name_valid != 0) { if (name_valid != 0) {
php_dom_throw_error(INVALID_CHARACTER_ERR, 1); php_dom_throw_error(INVALID_CHARACTER_ERR, 1);
RETURN_FALSE; return;
} }
/* Namespace logic is separate and only when uri passed in to insure no BC breakage */ /* Namespace logic is separate and only when uri passed in to insure no BC breakage */
@ -187,7 +187,7 @@ PHP_METHOD(domelement, __construct)
xmlFreeNode(nodep); xmlFreeNode(nodep);
} }
php_dom_throw_error(errorcode, 1); php_dom_throw_error(errorcode, 1);
RETURN_FALSE; return;
} }
} else { } else {
/* If you don't pass a namespace uri, then you can't set a prefix */ /* If you don't pass a namespace uri, then you can't set a prefix */
@ -196,14 +196,14 @@ PHP_METHOD(domelement, __construct)
xmlFree(localname); xmlFree(localname);
xmlFree(prefix); xmlFree(prefix);
php_dom_throw_error(NAMESPACE_ERR, 1); php_dom_throw_error(NAMESPACE_ERR, 1);
RETURN_FALSE; return;
} }
nodep = xmlNewNode(NULL, (xmlChar *) name); nodep = xmlNewNode(NULL, (xmlChar *) name);
} }
if (!nodep) { if (!nodep) {
php_dom_throw_error(INVALID_STATE_ERR, 1); php_dom_throw_error(INVALID_STATE_ERR, 1);
RETURN_FALSE; return;
} }
if (value_len > 0) { if (value_len > 0) {

2
ext/dom/node.c
View file

@ -1820,7 +1820,7 @@ PHP_METHOD(domnode, C14NFile)
} }
/* }}} */ /* }}} */
/* {{{ proto int DOMNode::getNodePath() /* {{{ proto string|null DOMNode::getNodePath()
Gets an xpath for a node */ Gets an xpath for a node */
PHP_METHOD(domnode, getNodePath) PHP_METHOD(domnode, getNodePath)
{ {