From 31cc63b1a41dab5f70d778c86ec3e8e2f98e41ea Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 25 Sep 2014 20:02:48 +0200 Subject: fix some extension builds --- ext/mysqlnd/mysqlnd_debug.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.c') diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index f1fde4efbb..0bbfe0133c 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -39,8 +39,6 @@ static const char * const mysqlnd_debug_empty_string = ""; static enum_func_status MYSQLND_METHOD(mysqlnd_debug, open)(MYSQLND_DEBUG * self, zend_bool reopen) { - MYSQLND_ZTS(self); - if (!self->file_name) { return FAIL; } @@ -67,7 +65,6 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self, unsigned int flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; - MYSQLND_ZTS(self); if (!self->stream && FAIL == self->m->open(self, FALSE)) { return FAIL; @@ -165,7 +162,6 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, unsigned int flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; - MYSQLND_ZTS(self); if (!self->stream && FAIL == self->m->open(self, FALSE)) { return FAIL; @@ -436,7 +432,6 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin static enum_func_status MYSQLND_METHOD(mysqlnd_debug, close)(MYSQLND_DEBUG * self) { - MYSQLND_ZTS(self); if (self->stream) { #ifndef MYSQLND_PROFILING_DISABLED if (!(self->flags & MYSQLND_DEBUG_FLUSH) && (self->flags & MYSQLND_DEBUG_PROFILE_CALLS)) { @@ -719,7 +714,7 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) { MYSQLND_DEBUG *ret = calloc(1, sizeof(MYSQLND_DEBUG)); #ifdef ZTS - ret->TSRMLS_C = TSRMLS_C; + ret->tsrm_ls = tsrm_get_ls_cache(); #endif ret->nest_level_limit = 0; ret->pid = getpid(); -- cgit v1.2.1 From 57dbe023649746b92bb85ff3114e6b10d26ca134 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 20:48:41 +0200 Subject: drop unused tsrm_ls --- ext/mysqlnd/mysqlnd_debug.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.c') diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 0bbfe0133c..c8f682b8e2 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -713,9 +713,7 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) { MYSQLND_DEBUG *ret = calloc(1, sizeof(MYSQLND_DEBUG)); -#ifdef ZTS - ret->tsrm_ls = tsrm_get_ls_cache(); -#endif + ret->nest_level_limit = 0; ret->pid = getpid(); zend_stack_init(&ret->call_stack, sizeof(char *)); -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/mysqlnd/mysqlnd_debug.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.c') diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index c8f682b8e2..b6ffca8d7f 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -556,7 +556,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const case ':': #if 0 if (state != PARSER_WAIT_COLON) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Consecutive semicolons at position %u", i); + php_error_docref(NULL, E_WARNING, "Consecutive semicolons at position %u", i); } #endif state = PARSER_WAIT_MODIFIER; @@ -593,7 +593,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const i = j; } else { #if 0 - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Expected list of functions for '%c' found none", mode[i]); #endif } @@ -673,7 +673,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const default: if (state == PARSER_WAIT_MODIFIER) { #if 0 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized format '%c'", mode[i]); + php_error_docref(NULL, E_WARNING, "Unrecognized format '%c'", mode[i]); #endif if (i+1 < mode_len && mode[i+1] == ',') { i+= 2; @@ -687,7 +687,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const state = PARSER_WAIT_COLON; } else if (state == PARSER_WAIT_COLON) { #if 0 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Colon expected, '%c' found", mode[i]); + php_error_docref(NULL, E_WARNING, "Colon expected, '%c' found", mode[i]); #endif } break; @@ -710,7 +710,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_debug_init */ PHPAPI MYSQLND_DEBUG * -mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) +mysqlnd_debug_init(const char * skip_functions[]) { MYSQLND_DEBUG *ret = calloc(1, sizeof(MYSQLND_DEBUG)); @@ -730,14 +730,14 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) /* {{{ _mysqlnd_debug */ -PHPAPI void _mysqlnd_debug(const char * mode TSRMLS_DC) +PHPAPI void _mysqlnd_debug(const char * mode) { #if PHP_DEBUG MYSQLND_DEBUG * dbg = MYSQLND_G(dbg); if (!dbg) { struct st_mysqlnd_plugin_trace_log * trace_log_plugin = mysqlnd_plugin_find("debug_trace"); if (trace_log_plugin) { - dbg = trace_log_plugin->methods.trace_instance_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC); + dbg = trace_log_plugin->methods.trace_instance_init(mysqlnd_debug_std_no_trace_funcs); if (!dbg) { return; } @@ -784,9 +784,9 @@ static struct st_mysqlnd_plugin_trace_log mysqlnd_plugin_trace_log_plugin = /* {{{ mysqlnd_debug_trace_plugin_register */ void -mysqlnd_debug_trace_plugin_register(TSRMLS_D) +mysqlnd_debug_trace_plugin_register(void) { - mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_plugin_trace_log_plugin TSRMLS_CC); + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_plugin_trace_log_plugin); } /* }}} */ -- cgit v1.2.1 From 386cb177bdc9d021b42febcc083ddaf9a4af3007 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 17 Dec 2014 11:05:23 +0100 Subject: remove unused ZTS macros --- ext/mysqlnd/mysqlnd_debug.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.c') diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index b6ffca8d7f..d374b8853b 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -28,12 +28,6 @@ static const char * const mysqlnd_debug_default_trace_file = "/tmp/mysqlnd.trace"; static const char * const mysqlnd_debug_empty_string = ""; -#ifdef ZTS -#define MYSQLND_ZTS(self) TSRMLS_D = (self)->TSRMLS_C -#else -#define MYSQLND_ZTS(self) -#endif - /* {{{ mysqlnd_debug::open */ static enum_func_status -- cgit v1.2.1