php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of remaining usages of zval_try_get_string() (#14041)

Browse Source 
This isn't necessary because the cases where we use it will always
succeed because the properties always have the type string|null.
This commit is contained in:
Niels Dossche
2024-04-24 23:47:10 +02:00
committed by GitHub
parent f68d72527a
commit 3626e2d552
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ext/dom/document.c
View File

@@ -194,10 +194,8 @@ zend_result dom_document_version_write(dom_object *obj, zval *newval)
{
DOM_PROP_NODE(xmlDocPtr, docp, obj);
zend_string *str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Cannot fail because the type is either null or a string. */
zend_string *str = zval_get_string(newval);
if (php_dom_follow_spec_intern(obj)) {
if (!zend_string_equals_literal(str, "1.0") && !zend_string_equals_literal(str, "1.1")) {
@@ -396,10 +394,8 @@ zend_result dom_document_document_uri_write(dom_object *obj, zval *newval)
{
DOM_PROP_NODE(xmlDocPtr, docp, obj);
zend_string *str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Cannot fail because the type is either null or a string. */
zend_string *str = zval_get_string(newval);
if (docp->URL != NULL) {
xmlFree(BAD_CAST docp->URL);
@@ -1780,7 +1776,6 @@ PHP_METHOD(DOMDocument, xinclude)
} else {
RETVAL_FALSE;
}
}
/* }}} */

6
ext/dom/node.c
View File

@@ -179,10 +179,8 @@ zend_result dom_node_node_value_write(dom_object *obj, zval *newval)
{
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
zend_string *str = zval_try_get_string(newval);
if (UNEXPECTED(!str)) {
return FAILURE;
}
/* Cannot fail because the type is either null or a string. */
zend_string *str = zval_get_string(newval);
/* Access to Element node is implemented as a convenience method */
switch (nodep->type) {