diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 17:32:02 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-16 17:32:02 +0200 |
| commit | d694e43c8656036b4d10eeebaa2fe90cb63c30e9 (patch) | |
| tree | fe078d3d3ef324ae5286cd0fcd9d6b277091337f /main | |
| parent | 808029c0498010b4b56cceb06276a9b0b6050587 (diff) | |
| download | php-git-d694e43c8656036b4d10eeebaa2fe90cb63c30e9.tar.gz | |
Remove unused global
Diffstat (limited to 'main')
| -rw-r--r-- | main/output.c | 20 | ||||
| -rw-r--r-- | main/php_output.h | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/main/output.c b/main/output.c index cffadede80..a31ea9cfad 100644 --- a/main/output.c +++ b/main/output.c @@ -103,20 +103,20 @@ static size_t (*php_output_direct)(const char *str, size_t str_len) = php_output static void php_output_header(void) { if (!SG(headers_sent)) { - if (!OG(output_start_filename_str)) { + if (!OG(output_start_filename)) { if (zend_is_compiling()) { - OG(output_start_filename_str) = zend_get_compiled_filename(); + OG(output_start_filename) = zend_get_compiled_filename(); OG(output_start_lineno) = zend_get_compiled_lineno(); } else if (zend_is_executing()) { - OG(output_start_filename_str) = zend_get_executed_filename_ex(); + OG(output_start_filename) = zend_get_executed_filename_ex(); OG(output_start_lineno) = zend_get_executed_lineno(); } - if (OG(output_start_filename_str)) { - zend_string_addref(OG(output_start_filename_str)); + if (OG(output_start_filename)) { + zend_string_addref(OG(output_start_filename)); } #if PHP_OUTPUT_DEBUG fprintf(stderr, "!!! output started at: %s (%d)\n", - ZSTR_VAL(OG(output_start_filename_str)), OG(output_start_lineno)); + ZSTR_VAL(OG(output_start_filename)), OG(output_start_lineno)); #endif } if (!php_header()) { @@ -195,9 +195,9 @@ PHPAPI void php_output_deactivate(void) zend_stack_destroy(&OG(handlers)); } - if (OG(output_start_filename_str)) { - zend_string_release(OG(output_start_filename_str)); - OG(output_start_filename_str) = NULL; + if (OG(output_start_filename)) { + zend_string_release(OG(output_start_filename)); + OG(output_start_filename) = NULL; } } /* }}} */ @@ -758,7 +758,7 @@ PHPAPI void php_output_set_implicit_flush(int flush) * Get the file name where output has started */ PHPAPI const char *php_output_get_start_filename(void) { - return ZSTR_VAL(OG(output_start_filename_str)); + return ZSTR_VAL(OG(output_start_filename)); } /* }}} */ diff --git a/main/php_output.h b/main/php_output.h index eba63e6039..18f611dece 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -137,10 +137,9 @@ ZEND_BEGIN_MODULE_GLOBALS(output) zend_stack handlers; php_output_handler *active; php_output_handler *running; - const char *output_start_filename; /* TODO: Unused, remove */ + zend_string *output_start_filename; int output_start_lineno; int flags; - zend_string *output_start_filename_str; ZEND_END_MODULE_GLOBALS(output) PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output) |