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

Remove unused global

Browse source
This commit is contained in:
Nikita Popov 2020-10-16 17:32:02 +02:00
parent 808029c049
commit d694e43c86
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
main/output.c
View file

@ -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) static void php_output_header(void)
{ {
if (!SG(headers_sent)) { if (!SG(headers_sent)) {
if (!OG(output_start_filename_str)) { if (!OG(output_start_filename)) {
if (zend_is_compiling()) { 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(); OG(output_start_lineno) = zend_get_compiled_lineno();
} else if (zend_is_executing()) { } 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(); OG(output_start_lineno) = zend_get_executed_lineno();
} }
if (OG(output_start_filename_str)) { if (OG(output_start_filename)) {
zend_string_addref(OG(output_start_filename_str)); zend_string_addref(OG(output_start_filename));
} }
#if PHP_OUTPUT_DEBUG #if PHP_OUTPUT_DEBUG
fprintf(stderr, "!!! output started at: %s (%d)\n", 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 #endif
} }
if (!php_header()) { if (!php_header()) {
@ -195,9 +195,9 @@ PHPAPI void php_output_deactivate(void)
zend_stack_destroy(&OG(handlers)); zend_stack_destroy(&OG(handlers));
} }
if (OG(output_start_filename_str)) { if (OG(output_start_filename)) {
zend_string_release(OG(output_start_filename_str)); zend_string_release(OG(output_start_filename));
OG(output_start_filename_str) = NULL; 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 */ * Get the file name where output has started */
PHPAPI const char *php_output_get_start_filename(void) PHPAPI const char *php_output_get_start_filename(void)
{ {
return ZSTR_VAL(OG(output_start_filename_str)); return ZSTR_VAL(OG(output_start_filename));
} }
/* }}} */ /* }}} */

3
main/php_output.h
View file

@ -137,10 +137,9 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
zend_stack handlers; zend_stack handlers;
php_output_handler *active; php_output_handler *active;
php_output_handler *running; php_output_handler *running;
const char *output_start_filename; /* TODO: Unused, remove */ zend_string *output_start_filename;
int output_start_lineno; int output_start_lineno;
int flags; int flags;
zend_string *output_start_filename_str;
ZEND_END_MODULE_GLOBALS(output) ZEND_END_MODULE_GLOBALS(output)
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output) PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output)