diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
| commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
| tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /ext/mysqlnd/php_mysqlnd.c | |
| parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
| download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz | |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 71512e8d46..01e71618e6 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -56,7 +56,7 @@ mysqlnd_minfo_print_hash(zval *values) /* {{{ mysqlnd_minfo_dump_plugin_stats */ static int -mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument TSRMLS_DC) +mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument) { struct st_mysqlnd_plugin_header * plugin_header = (struct st_mysqlnd_plugin_header *)Z_PTR_P(el); if (plugin_header->plugin_stats.values) { @@ -79,7 +79,7 @@ mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument TSRMLS_DC) /* {{{ mysqlnd_minfo_dump_loaded_plugins */ static int -mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf TSRMLS_DC) +mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf) { smart_str * buffer = (smart_str *) buf; struct st_mysqlnd_plugin_header * plugin_header = (struct st_mysqlnd_plugin_header *)Z_PTR_P(el); @@ -96,9 +96,9 @@ mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf TSRMLS_DC) /* {{{ mysqlnd_minfo_dump_api_plugins */ static void -mysqlnd_minfo_dump_api_plugins(smart_str * buffer TSRMLS_DC) +mysqlnd_minfo_dump_api_plugins(smart_str * buffer) { - HashTable *ht = mysqlnd_reverse_api_get_api_list(TSRMLS_C); + HashTable *ht = mysqlnd_reverse_api_get_api_list(); MYSQLND_REVERSE_API *ext; ZEND_HASH_FOREACH_PTR(ht, ext) { @@ -157,7 +157,7 @@ PHP_MINFO_FUNCTION(mysqlnd) php_info_print_table_row(2, "Loaded plugins", tmp_str.s? tmp_str.s->val : ""); smart_str_free(&tmp_str); - mysqlnd_minfo_dump_api_plugins(&tmp_str TSRMLS_CC); + mysqlnd_minfo_dump_api_plugins(&tmp_str); smart_str_0(&tmp_str); php_info_print_table_row(2, "API Extensions", tmp_str.s? tmp_str.s->val : ""); smart_str_free(&tmp_str); @@ -255,7 +255,7 @@ static PHP_MINIT_FUNCTION(mysqlnd) { REGISTER_INI_ENTRIES(); - mysqlnd_library_init(TSRMLS_C); + mysqlnd_library_init(); return SUCCESS; } /* }}} */ @@ -265,7 +265,7 @@ static PHP_MINIT_FUNCTION(mysqlnd) */ static PHP_MSHUTDOWN_FUNCTION(mysqlnd) { - mysqlnd_library_end(TSRMLS_C); + mysqlnd_library_end(); UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -282,8 +282,8 @@ static PHP_RINIT_FUNCTION(mysqlnd) struct st_mysqlnd_plugin_trace_log * trace_log_plugin = mysqlnd_plugin_find("debug_trace"); MYSQLND_G(dbg) = NULL; if (trace_log_plugin) { - MYSQLND_DEBUG * dbg = trace_log_plugin->methods.trace_instance_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC); - MYSQLND_DEBUG * trace_alloc = trace_log_plugin->methods.trace_instance_init(NULL TSRMLS_CC); + MYSQLND_DEBUG * dbg = trace_log_plugin->methods.trace_instance_init(mysqlnd_debug_std_no_trace_funcs); + MYSQLND_DEBUG * trace_alloc = trace_log_plugin->methods.trace_instance_init(NULL); if (!dbg || !trace_alloc) { return FAILURE; } |