Skip to content

Rename PHP_STREAM_TO_ZVAL to PHP_STREAM_FROM_ZVAL #10065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2022
Merged

Rename PHP_STREAM_TO_ZVAL to PHP_STREAM_FROM_ZVAL #10065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions ext/standard/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
php_stream_from_res(stream, Z_RES_P(arg));

Expand Down Expand Up @@ -238,7 +238,7 @@ PHP_FUNCTION(flock)
Z_PARAM_ZVAL(wouldblock)
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);
}
Expand Down Expand Up @@ -775,7 +775,7 @@ PHPAPI PHP_FUNCTION(fclose)
Z_PARAM_RESOURCE(res)
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) {
php_error_docref(NULL, E_WARNING, ZEND_LONG_FMT " is not a valid stream resource", stream->res->handle);
Expand Down Expand Up @@ -855,7 +855,7 @@ PHP_FUNCTION(pclose)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

FG(pclose_wait) = 1;
zend_list_close(stream->res);
Expand All @@ -874,7 +874,7 @@ PHPAPI PHP_FUNCTION(feof)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (php_stream_eof(stream)) {
RETURN_TRUE;
Expand All @@ -901,7 +901,7 @@ PHPAPI PHP_FUNCTION(fgets)
Z_PARAM_LONG_OR_NULL(len, len_is_null)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (len_is_null) {
/* ask streams to give us a buffer of an appropriate size */
Expand Down Expand Up @@ -945,7 +945,7 @@ PHPAPI PHP_FUNCTION(fgetc)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

int result = php_stream_getc(stream);

Expand Down Expand Up @@ -1029,7 +1029,7 @@ PHPAPI PHP_FUNCTION(fwrite)
RETURN_LONG(0);
}

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

ret = php_stream_write(stream, input, num_bytes);
if (ret < 0) {
Expand All @@ -1051,7 +1051,7 @@ PHPAPI PHP_FUNCTION(fflush)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

ret = php_stream_flush(stream);
if (ret) {
Expand All @@ -1071,7 +1071,7 @@ PHPAPI PHP_FUNCTION(rewind)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (-1 == php_stream_rewind(stream)) {
RETURN_FALSE;
Expand All @@ -1091,7 +1091,7 @@ PHPAPI PHP_FUNCTION(ftell)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

ret = php_stream_tell(stream);
if (ret == -1) {
Expand All @@ -1115,7 +1115,7 @@ PHPAPI PHP_FUNCTION(fseek)
Z_PARAM_LONG(whence)
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));
}
Expand Down Expand Up @@ -1259,7 +1259,7 @@ PHPAPI PHP_FUNCTION(fpassthru)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

size = php_stream_passthru(stream);
RETURN_LONG(size);
Expand Down Expand Up @@ -1346,7 +1346,7 @@ PHP_FUNCTION(fsync)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (!php_stream_sync_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't fsync this stream!");
Expand All @@ -1365,7 +1365,7 @@ PHP_FUNCTION(fdatasync)
Z_PARAM_RESOURCE(res)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (!php_stream_sync_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't fsync this stream!");
Expand All @@ -1392,7 +1392,7 @@ PHP_FUNCTION(ftruncate)
RETURN_THROWS();
}

PHP_STREAM_TO_ZVAL(stream, fp);
PHP_STREAM_FROM_ZVAL(stream, fp);

if (!php_stream_truncate_supported(stream)) {
php_error_docref(NULL, E_WARNING, "Can't truncate this stream!");
Expand Down Expand Up @@ -1484,7 +1484,7 @@ PHP_FUNCTION(fstat)
Z_PARAM_RESOURCE(fp)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, fp);
PHP_STREAM_FROM_ZVAL(stream, fp);

php_fstat(stream, return_value);
}
Expand Down Expand Up @@ -1639,7 +1639,7 @@ PHPAPI PHP_FUNCTION(fread)
Z_PARAM_LONG(len)
ZEND_PARSE_PARAMETERS_END();

PHP_STREAM_TO_ZVAL(stream, res);
PHP_STREAM_FROM_ZVAL(stream, res);

if (len <= 0) {
zend_argument_value_error(2, "must be greater than 0");
Expand Down Expand Up @@ -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);
if (ret < 0) {
Expand Down Expand Up @@ -1899,7 +1899,7 @@ PHP_FUNCTION(fgetcsv)
RETURN_THROWS();
}

PHP_STREAM_TO_ZVAL(stream, fd);
PHP_STREAM_FROM_ZVAL(stream, fd);
}

if (len < 0) {
Expand Down