diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 16:40:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 16:44:37 +0200 |
| commit | 49bac9b77bc9cacc0f984092d226e951ae336b43 (patch) | |
| tree | f705f93aa693fc5e0ea5c44231585fd41f42dd57 /sapi/cli | |
| parent | 46faf8f018e95de27873dbcf7c094af18c4c08e4 (diff) | |
| download | php-git-49bac9b77bc9cacc0f984092d226e951ae336b43.tar.gz | |
Introduce zend_stream_init_filename()
Avoid more ad-hoc initialization of zend_file_handle structures.
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 40fad8c10b..f00d8dee54 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2072,11 +2072,7 @@ static int php_cli_server_dispatch_script(php_cli_server *server, php_cli_server } { zend_file_handle zfd; - zfd.type = ZEND_HANDLE_FILENAME; - zfd.filename = SG(request_info).path_translated; - zfd.handle.fp = NULL; - zfd.free_filename = 0; - zfd.opened_path = NULL; + zend_stream_init_filename(&zfd, SG(request_info).path_translated); zend_try { php_execute_script(&zfd); } zend_end_try(); @@ -2197,11 +2193,7 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server old_cwd[0] = '\0'; php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1)); - zfd.type = ZEND_HANDLE_FILENAME; - zfd.filename = server->router; - zfd.handle.fp = NULL; - zfd.free_filename = 0; - zfd.opened_path = NULL; + zend_stream_init_filename(&zfd, server->router); zend_try { zval retval; |