clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't explicitly set return value on ZPP failure in ext/iconv

Browse Source 
Failing ZPP throws as of PHP 8.0.0, so explicitly setting a return
value is useless, and also slightly confusing.
This commit is contained in:
Christoph M. Becker 2019-08-23 18:11:48 +02:00
parent d420336115
commit bba7f38c4f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/iconv/iconv.c
View File

@ -2004,7 +2004,7 @@ PHP_FUNCTION(iconv_strlen)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|s",
&str, &charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (charset_len >= ICONV_CSNMAXLEN) {
@ -2038,7 +2038,7 @@ PHP_FUNCTION(iconv_substr)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sl|ls",
&str, &offset, &length,
&charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (charset_len >= ICONV_CSNMAXLEN) {
@ -2078,7 +2078,7 @@ PHP_FUNCTION(iconv_strpos)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|ls",
&haystk, &ndl,
&offset, &charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (charset_len >= ICONV_CSNMAXLEN) {
@ -2132,7 +2132,7 @@ PHP_FUNCTION(iconv_strrpos)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|s",
&haystk, &ndl,
&charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (ZSTR_LEN(ndl) < 1) {
@ -2177,7 +2177,7 @@ PHP_FUNCTION(iconv_mime_encode)
&field_name, &field_value,
&pref) == FAILURE) {
RETURN_FALSE;
return;
}
if (pref != NULL) {
@ -2275,7 +2275,7 @@ PHP_FUNCTION(iconv_mime_decode)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|ls",
&encoded_str, &mode, &charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (charset_len >= ICONV_CSNMAXLEN) {
@ -2315,7 +2315,7 @@ PHP_FUNCTION(iconv_mime_decode_headers)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|ls",
&encoded_str, &mode, &charset, &charset_len) == FAILURE) {
RETURN_FALSE;
return;
}
if (charset_len >= ICONV_CSNMAXLEN) {