Skip to content

Commit 7695049

Browse files
committed
Don't explicitly set return value on ZFR failure in ext/xmlwriter
Failing `zend_fetch_resource(2)` throws as of PHP 8.0.0, so explicitly setting a return value is useless, and also slightly confusing.
1 parent 489dec1 commit 7695049

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

ext/xmlwriter/php_xmlwriter.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ static void php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_rea
382382
}
383383

384384
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
385-
RETURN_FALSE;
385+
return;
386386
}
387387
}
388388

@@ -420,7 +420,7 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
420420
return;
421421
}
422422
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
423-
RETURN_FALSE;
423+
return;
424424
}
425425
}
426426

@@ -458,7 +458,7 @@ static PHP_FUNCTION(xmlwriter_set_indent)
458458
return;
459459
}
460460
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
461-
RETURN_FALSE;
461+
return;
462462
}
463463
}
464464

@@ -523,7 +523,7 @@ static PHP_FUNCTION(xmlwriter_start_attribute_ns)
523523
return;
524524
}
525525
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
526-
RETURN_FALSE;
526+
return;
527527
}
528528
}
529529

@@ -566,7 +566,7 @@ static PHP_FUNCTION(xmlwriter_write_attribute)
566566
return;
567567
}
568568
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
569-
RETURN_FALSE;
569+
return;
570570
}
571571
}
572572

@@ -610,7 +610,7 @@ static PHP_FUNCTION(xmlwriter_write_attribute_ns)
610610
return;
611611
}
612612
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
613-
RETURN_FALSE;
613+
return;
614614
}
615615
}
616616

@@ -661,7 +661,7 @@ static PHP_FUNCTION(xmlwriter_start_element_ns)
661661
return;
662662
}
663663
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
664-
RETURN_FALSE;
664+
return;
665665
}
666666
}
667667

@@ -721,7 +721,7 @@ static PHP_FUNCTION(xmlwriter_write_element)
721721
return;
722722
}
723723
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
724-
RETURN_FALSE;
724+
return;
725725
}
726726
}
727727

@@ -775,7 +775,7 @@ static PHP_FUNCTION(xmlwriter_write_element_ns)
775775
return;
776776
}
777777
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
778-
RETURN_FALSE;
778+
return;
779779
}
780780
}
781781

@@ -846,7 +846,7 @@ static PHP_FUNCTION(xmlwriter_write_pi)
846846
return;
847847
}
848848
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
849-
RETURN_FALSE;
849+
return;
850850
}
851851
}
852852

@@ -882,7 +882,7 @@ static PHP_FUNCTION(xmlwriter_start_cdata)
882882
return;
883883
}
884884
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
885-
RETURN_FALSE;
885+
return;
886886
}
887887
}
888888

@@ -948,7 +948,7 @@ static PHP_FUNCTION(xmlwriter_start_comment)
948948
return;
949949
}
950950
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
951-
RETURN_FALSE;
951+
return;
952952
}
953953
}
954954

@@ -1004,7 +1004,7 @@ static PHP_FUNCTION(xmlwriter_start_document)
10041004
return;
10051005
}
10061006
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1007-
RETURN_FALSE;
1007+
return;
10081008
}
10091009
}
10101010

@@ -1052,7 +1052,7 @@ static PHP_FUNCTION(xmlwriter_start_dtd)
10521052
return;
10531053
}
10541054
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1055-
RETURN_FALSE;
1055+
return;
10561056
}
10571057
}
10581058
ptr = intern->ptr;
@@ -1100,7 +1100,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd)
11001100
}
11011101

11021102
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1103-
RETURN_FALSE;
1103+
return;
11041104
}
11051105
}
11061106

@@ -1156,7 +1156,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_element)
11561156
return;
11571157
}
11581158
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1159-
RETURN_FALSE;
1159+
return;
11601160
}
11611161
}
11621162

@@ -1215,7 +1215,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_attlist)
12151215
return;
12161216
}
12171217
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1218-
RETURN_FALSE;
1218+
return;
12191219
}
12201220
}
12211221

@@ -1257,7 +1257,7 @@ static PHP_FUNCTION(xmlwriter_start_dtd_entity)
12571257
return;
12581258
}
12591259
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1260-
RETURN_FALSE;
1260+
return;
12611261
}
12621262
}
12631263

@@ -1314,7 +1314,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
13141314
return;
13151315
}
13161316
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1317-
RETURN_FALSE;
1317+
return;
13181318
}
13191319
}
13201320

@@ -1456,7 +1456,7 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
14561456
}
14571457

14581458
if ((intern = (xmlwriter_object *)zend_fetch_resource(Z_RES_P(pind), "XMLWriter", le_xmlwriter)) == NULL) {
1459-
RETURN_FALSE;
1459+
return;
14601460
}
14611461
}
14621462
ptr = intern->ptr;

0 commit comments

Comments
 (0)