From: Nikita Popov Date: Tue, 20 Aug 2019 08:35:27 +0000 (+0200) Subject: Remove some unnecessary RETURN_FALSE uses X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af5c637f9667c97c83759dcf8581479aa6636c44;p=php Remove some unnecessary RETURN_FALSE uses --- diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 95f2168df9..d1f8044d6d 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -397,11 +397,11 @@ PHP_FUNCTION(stream_bucket_make_writeable) ZEND_PARSE_PARAMETERS_START(1, 1) Z_PARAM_RESOURCE(zbrigade) - ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); + ZEND_PARSE_PARAMETERS_END(); if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource( Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) { - RETURN_FALSE; + return; } ZVAL_NULL(return_value); @@ -429,7 +429,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_RESOURCE(zbrigade) Z_PARAM_OBJECT(zobject) - ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); + ZEND_PARSE_PARAMETERS_END(); if (NULL == (pzbucket = zend_hash_str_find(Z_OBJPROP_P(zobject), "bucket", sizeof("bucket")-1))) { php_error_docref(NULL, E_WARNING, "Object has no bucket property"); @@ -438,11 +438,11 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource( Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) { - RETURN_FALSE; + return; } if ((bucket = (php_stream_bucket *)zend_fetch_resource_ex(pzbucket, PHP_STREAM_BUCKET_RES_NAME, le_bucket)) == NULL) { - RETURN_FALSE; + return; } if (NULL != (pzdata = zend_hash_str_find(Z_OBJPROP_P(zobject), "data", sizeof("data")-1)) && Z_TYPE_P(pzdata) == IS_STRING) { @@ -500,7 +500,7 @@ PHP_FUNCTION(stream_bucket_new) ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ZVAL(zstream) Z_PARAM_STRING(buffer, buffer_len) - ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); + ZEND_PARSE_PARAMETERS_END(); php_stream_from_zval(stream, zstream); @@ -560,7 +560,7 @@ PHP_FUNCTION(stream_filter_register) ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_STR(filtername) Z_PARAM_STR(classname) - ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); + ZEND_PARSE_PARAMETERS_END(); RETVAL_FALSE;