sniper Mon Feb 21 15:57:21 2005 EDT
Modified files:
/php-src/main SAPI.c
Log:
Remove the useless TSRM_FETCH calls
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.193&r2=1.194&ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.193 php-src/main/SAPI.c:1.194
--- php-src/main/SAPI.c:1.193 Mon Feb 21 10:14:02 2005
+++ php-src/main/SAPI.c Mon Feb 21 15:57:18 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.193 2005/02/21 15:14:02 moriyoshi Exp $ */
+/* $Id: SAPI.c,v 1.194 2005/02/21 20:57:18 sniper Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -60,8 +60,7 @@
static void sapi_globals_ctor(sapi_globals_struct *sapi_globals TSRMLS_DC)
{
memset(sapi_globals, 0, sizeof(*sapi_globals));
- zend_hash_init_ex(&sapi_globals->known_post_content_types, 5,
- NULL, NULL, 1, 0);
+ zend_hash_init_ex(&sapi_globals->known_post_content_types, 5, NULL,
NULL, 1, 0);
}
static void sapi_globals_dtor(sapi_globals_struct *sapi_globals TSRMLS_DC)
@@ -80,8 +79,7 @@
#ifdef ZTS
ts_allocate_id(&sapi_globals_id, sizeof(sapi_globals_struct),
(ts_allocate_ctor) sapi_globals_ctor, (ts_allocate_dtor) sapi_globals_dtor);
#else
- TSRMLS_FETCH();
- sapi_globals_ctor(&sapi_globals TSRMLS_CC);
+ sapi_globals_ctor(&sapi_globals);
#endif
virtual_cwd_startup(); /* Could use shutdown to free the main cwd but
it would just slow it down for CGI */
@@ -98,8 +96,7 @@
#ifdef ZTS
ts_free_id(&sapi_globals_id);
#else
- TSRMLS_FETCH();
- sapi_globals_dtor(&sapi_globals TSRMLS_CC);
+ sapi_globals_dtor(&sapi_globals);
#endif
reentrancy_shutdown();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
