felipe Fri Aug 15 19:47:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c
zend_gc.c zend_gc.h zend_language_scanner.c
zend_language_scanner.l zend_operators.c zend_stream.c
zend_vm_def.h zend_vm_execute.h
/php-src/main main.c
Log:
- MFH: Removed some TSRMLS_FETCH()s
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.22&r2=1.308.2.12.2.35.2.23&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.22
ZendEngine2/zend.c:1.308.2.12.2.35.2.23
--- ZendEngine2/zend.c:1.308.2.12.2.35.2.22 Thu Aug 14 10:24:51 2008
+++ ZendEngine2/zend.c Fri Aug 15 19:47:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.308.2.12.2.35.2.22 2008/08/14 10:24:51 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.23 2008/08/15 19:47:23 felipe Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -50,7 +50,7 @@
ZEND_API zend_class_entry *zend_standard_class_def = NULL;
ZEND_API int (*zend_printf)(const char *format, ...);
ZEND_API zend_write_func_t zend_write;
-ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
+ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path
TSRMLS_DC);
ZEND_API int (*zend_stream_open_function)(const char *filename,
zend_file_handle *handle TSRMLS_DC);
ZEND_API void (*zend_block_interruptions)(void);
ZEND_API void (*zend_unblock_interruptions)(void);
@@ -62,7 +62,7 @@
void (*zend_on_timeout)(int seconds TSRMLS_DC);
-static void (*zend_message_dispatcher_p)(long message, void *data);
+static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC);
static int (*zend_get_configuration_directive_p)(const char *name, uint
name_length, zval *contents);
static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
@@ -423,7 +423,7 @@
}
/* }}} */
-static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) /*
{{{ */
+static FILE *zend_fopen_wrapper(const char *filename, char **opened_path
TSRMLS_DC) /* {{{ */
{
if (opened_path) {
*opened_path = estrdup(filename);
@@ -601,7 +601,7 @@
void zend_init_opcodes_handlers(void);
-int zend_startup(zend_utility_functions *utility_functions, char **extensions,
int start_builtin_functions) /* {{{ */
+int zend_startup(zend_utility_functions *utility_functions, char **extensions,
int start_builtin_functions TSRMLS_DC) /* {{{ */
{
#ifdef ZTS
zend_compiler_globals *compiler_globals;
@@ -612,7 +612,6 @@
extern zend_ini_scanner_globals ini_scanner_globals;
extern zend_php_scanner_globals language_scanner_globals;
#endif
- TSRMLS_FETCH();
start_memory_manager(TSRMLS_C);
@@ -680,7 +679,6 @@
ts_allocate_id(&ini_scanner_globals_id,
sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor,
NULL);
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
- tsrm_ls = ts_resource_ex(0, NULL);
compiler_globals_dtor(compiler_globals TSRMLS_CC);
compiler_globals->in_compilation = 0;
@@ -949,10 +947,10 @@
/* }}} */
BEGIN_EXTERN_C()
-ZEND_API void zend_message_dispatcher(long message, void *data) /* {{{ */
+ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /*
{{{ */
{
if (zend_message_dispatcher_p) {
- zend_message_dispatcher_p(message, data);
+ zend_message_dispatcher_p(message, data TSRMLS_CC);
}
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.27&r2=1.293.2.11.2.9.2.28&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.27
ZendEngine2/zend.h:1.293.2.11.2.9.2.28
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.27 Tue Aug 12 17:20:23 2008
+++ ZendEngine2/zend.h Fri Aug 15 19:47:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.27 2008/08/12 17:20:23 felipe Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.28 2008/08/15 19:47:23 felipe Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -469,8 +469,8 @@
void (*error_function)(int type, const char *error_filename, const uint
error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
int (*printf_function)(const char *format, ...)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
int (*write_function)(const char *str, uint str_length);
- FILE *(*fopen_function)(const char *filename, char **opened_path);
- void (*message_handler)(long message, void *data);
+ FILE *(*fopen_function)(const char *filename, char **opened_path
TSRMLS_DC);
+ void (*message_handler)(long
