From 50293835bf1884b4ee851075711b360150779c68 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Wed, 8 Aug 2007 23:51:57 +0000 Subject: [PATCH] remove unneeded variables --- sapi/cgi/cgi_main.c | 10 +--------- sapi/cli/php_cli.c | 13 +------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 6f1ea9c7cb..ad0ab8d9ac 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1161,10 +1161,6 @@ int main(int argc, char *argv[]) /* end of temporary locals */ #ifdef ZTS - zend_compiler_globals *compiler_globals; - zend_executor_globals *executor_globals; - php_core_globals *core_globals; - sapi_globals_struct *sapi_globals; void ***tsrm_ls; #endif @@ -1204,6 +1200,7 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); #endif sapi_startup(&cgi_sapi_module); @@ -1295,11 +1292,6 @@ int main(int argc, char *argv[]) php_optarg = orig_optarg; #ifdef ZTS - compiler_globals = ts_resource(compiler_globals_id); - executor_globals = ts_resource(executor_globals_id); - core_globals = ts_resource(core_globals_id); - sapi_globals = ts_resource(sapi_globals_id); - tsrm_ls = ts_resource(0); SG(request_info).path_translated = NULL; #endif diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 282aa932c7..395888cceb 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -607,10 +607,6 @@ int main(int argc, char *argv[]) int hide_argv = 0; /* end of temporary locals */ #ifdef ZTS - zend_compiler_globals *compiler_globals; - zend_executor_globals *executor_globals; - php_core_globals *core_globals; - sapi_globals_struct *sapi_globals; void ***tsrm_ls; #endif #ifdef PHP_CLI_WIN32_NO_CONSOLE @@ -648,6 +644,7 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); #endif cli_sapi_module.ini_defaults = sapi_cli_ini_defaults; @@ -716,14 +713,6 @@ int main(int argc, char *argv[]) cli_sapi_module.executable_location = argv[0]; -#ifdef ZTS - compiler_globals = ts_resource(compiler_globals_id); - executor_globals = ts_resource(executor_globals_id); - core_globals = ts_resource(core_globals_id); - sapi_globals = ts_resource(sapi_globals_id); - tsrm_ls = ts_resource(0); -#endif - /* startup after we get the above ini override se we get things right */ if (cli_sapi_module.startup(&cli_sapi_module)==FAILURE) { /* there is no way to see if we must call zend_ini_deactivate() -- 2.40.0