From: Stanislav Malyshev <stas@php.net>
Date: Wed, 8 Aug 2007 21:57:30 +0000 (+0000)
Subject: fix startup - remove unneeded variables
X-Git-Tag: php-5.2.4RC2~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45e907a0eeae9524bc9a3acd0d5c64f405241c1d;p=php

fix startup - remove unneeded variables
---

diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index fcf0b158d5..0d68847b8d 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -143,7 +143,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
 {
 	zend_llist global_vars;
 #ifdef ZTS
-	sapi_globals_struct *sapi_globals = NULL;
 	void ***tsrm_ls = NULL;
 #endif
 	int ini_entries_len = 0;
@@ -168,6 +167,8 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
 
 #ifdef ZTS
   tsrm_startup(1, 1, 0, NULL);
+  tsrm_ls = ts_resource(0);
+  *ptsrm_ls = tsrm_ls;
 #endif
 
   ini_entries_len = strlen(HARDCODED_INI);
@@ -185,12 +186,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
 	  return FAILURE;
   }
  
-#ifdef ZTS
-  sapi_globals = ts_resource(sapi_globals_id);
-  tsrm_ls = ts_resource(0);
-  *ptsrm_ls = tsrm_ls;
-#endif
-
   zend_llist_init(&global_vars, sizeof(char *), NULL, 0);  
 
   /* Set some Embedded PHP defaults */