archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename PHP_STREAM_TO_ZVAL to PHP_STREAM_FROM_ZVAL (#10065)

Browse source
This commit is contained in:
Niels 2022-12-07 19:57:50 +01:00 • committed by GitHub
parent 35a4950ffa
commit 11b612af6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ext/standard/file.c
View file

@ -114,7 +114,7 @@ php_file_globals file_globals;
/* }}} */ /* }}} */
#define PHP_STREAM_TO_ZVAL(stream, arg) \ #define PHP_STREAM_FROM_ZVAL(stream, arg) \
ZEND_ASSERT(Z_TYPE_P(arg) == IS_RESOURCE); \ ZEND_ASSERT(Z_TYPE_P(arg) == IS_RESOURCE); \
php_stream_from_res(stream, Z_RES_P(arg)); php_stream_from_res(stream, Z_RES_P(arg));
@ -238,7 +238,7 @@ PHP_FUNCTION(flock)
Z_PARAM_ZVAL(wouldblock) Z_PARAM_ZVAL(wouldblock)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
php_flock_common(stream, operation, 2, wouldblock, return_value); php_flock_common(stream, operation, 2, wouldblock, return_value);
} }
@ -775,7 +775,7 @@ PHPAPI PHP_FUNCTION(fclose)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) { if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) {
php_error_docref(NULL, E_WARNING, ZEND_LONG_FMT " is not a valid stream resource", stream->res->handle); php_error_docref(NULL, E_WARNING, ZEND_LONG_FMT " is not a valid stream resource", stream->res->handle);
@ -855,7 +855,7 @@ PHP_FUNCTION(pclose)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
FG(pclose_wait) = 1; FG(pclose_wait) = 1;
zend_list_close(stream->res); zend_list_close(stream->res);
@ -874,7 +874,7 @@ PHPAPI PHP_FUNCTION(feof)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (php_stream_eof(stream)) { if (php_stream_eof(stream)) {
RETURN_TRUE; RETURN_TRUE;
@ -901,7 +901,7 @@ PHPAPI PHP_FUNCTION(fgets)
Z_PARAM_LONG_OR_NULL(len, len_is_null) Z_PARAM_LONG_OR_NULL(len, len_is_null)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (len_is_null) { if (len_is_null) {
/* ask streams to give us a buffer of an appropriate size */ /* ask streams to give us a buffer of an appropriate size */
@ -945,7 +945,7 @@ PHPAPI PHP_FUNCTION(fgetc)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
int result = php_stream_getc(stream); int result = php_stream_getc(stream);
@ -1029,7 +1029,7 @@ PHPAPI PHP_FUNCTION(fwrite)
RETURN_LONG(0); RETURN_LONG(0);
} }
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
ret = php_stream_write(stream, input, num_bytes); ret = php_stream_write(stream, input, num_bytes);
if (ret < 0) { if (ret < 0) {
@ -1051,7 +1051,7 @@ PHPAPI PHP_FUNCTION(fflush)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
ret = php_stream_flush(stream); ret = php_stream_flush(stream);
if (ret) { if (ret) {
@ -1071,7 +1071,7 @@ PHPAPI PHP_FUNCTION(rewind)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (-1 == php_stream_rewind(stream)) { if (-1 == php_stream_rewind(stream)) {
RETURN_FALSE; RETURN_FALSE;
@ -1091,7 +1091,7 @@ PHPAPI PHP_FUNCTION(ftell)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
ret = php_stream_tell(stream); ret = php_stream_tell(stream);
if (ret == -1) { if (ret == -1) {
@ -1115,7 +1115,7 @@ PHPAPI PHP_FUNCTION(fseek)
Z_PARAM_LONG(whence) Z_PARAM_LONG(whence)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
RETURN_LONG(php_stream_seek(stream, offset, (int) whence)); RETURN_LONG(php_stream_seek(stream, offset, (int) whence));
} }
@ -1259,7 +1259,7 @@ PHPAPI PHP_FUNCTION(fpassthru)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
size = php_stream_passthru(stream); size = php_stream_passthru(stream);
RETURN_LONG(size); RETURN_LONG(size);
@ -1346,7 +1346,7 @@ PHP_FUNCTION(fsync)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (!php_stream_sync_supported(stream)) { if (!php_stream_sync_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't fsync this stream!"); php_error_docref(NULL, E_WARNING, "Can't fsync this stream!");
@ -1365,7 +1365,7 @@ PHP_FUNCTION(fdatasync)
Z_PARAM_RESOURCE(res) Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (!php_stream_sync_supported(stream)) { if (!php_stream_sync_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't fsync this stream!"); php_error_docref(NULL, E_WARNING, "Can't fsync this stream!");
@ -1392,7 +1392,7 @@ PHP_FUNCTION(ftruncate)
RETURN_THROWS(); RETURN_THROWS();
} }
PHP_STREAM_TO_ZVAL(stream, fp); PHP_STREAM_FROM_ZVAL(stream, fp);
if (!php_stream_truncate_supported(stream)) { if (!php_stream_truncate_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't truncate this stream!"); php_error_docref(NULL, E_WARNING, "Can't truncate this stream!");
@ -1484,7 +1484,7 @@ PHP_FUNCTION(fstat)
Z_PARAM_RESOURCE(fp) Z_PARAM_RESOURCE(fp)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, fp); PHP_STREAM_FROM_ZVAL(stream, fp);
php_fstat(stream, return_value); php_fstat(stream, return_value);
} }
@ -1639,7 +1639,7 @@ PHPAPI PHP_FUNCTION(fread)
Z_PARAM_LONG(len) Z_PARAM_LONG(len)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
PHP_STREAM_TO_ZVAL(stream, res); PHP_STREAM_FROM_ZVAL(stream, res);
if (len <= 0) { if (len <= 0) {
zend_argument_value_error(2, "must be greater than 0"); zend_argument_value_error(2, "must be greater than 0");
@ -1752,7 +1752,7 @@ PHP_FUNCTION(fputcsv)
} }
} }
PHP_STREAM_TO_ZVAL(stream, fp); PHP_STREAM_FROM_ZVAL(stream, fp);
ret = php_fputcsv(stream, fields, delimiter, enclosure, escape_char, eol_str); ret = php_fputcsv(stream, fields, delimiter, enclosure, escape_char, eol_str);
if (ret < 0) { if (ret < 0) {
@ -1899,7 +1899,7 @@ PHP_FUNCTION(fgetcsv)
RETURN_THROWS(); RETURN_THROWS();
} }
PHP_STREAM_TO_ZVAL(stream, fd); PHP_STREAM_FROM_ZVAL(stream, fd);
} }
if (len < 0) { if (len < 0) {