com php-src: Use TSRM macros: main/output.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_utils.h

Commit: 083cfc07cc13b1804ceeaa61f44319c598c05670 Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Feb 2019 17:40:29 +0300 Parents: 626bc3a2de517f4e0ae647324dd05ceacdfe776b Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=083cfc07cc13b1804ceeaa61f44319c598c05670 Log: Use TSRM macros Changed paths: M main/output.c M sapi/phpdbg/phpdbg.c M sapi/phpdbg/phpdbg_utils.h Diff: diff --git a/main/output.c b/main/output.c index 49e2535..4b21579 100644 --- a/main/output.c +++ b/main/output.c @@ -159,7 +159,7 @@ PHPAPI void php_output_shutdown(void) PHPAPI int php_output_activate(void) { #ifdef ZTS - memset((*((void ***) ZEND_TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)], 0, sizeof(zend_output_globals)); + memset(TSRMG_BULK_STATIC(output_globals_id, zend_output_globals*), 0, sizeof(zend_output_globals)); #else memset(&output_globals, 0, sizeof(zend_output_globals)); #endif diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 3d8856c..4834f8b 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1664,7 +1664,8 @@ phpdbg_main: if (settings > (zend_phpdbg_globals *) 0x2) { #ifdef ZTS - *((zend_phpdbg_globals *) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(phpdbg_globals_id)]) = *settings; + zend_phpdbg_globals *ptr = TSRMG_BULK_STATIC(phpdbg_globals_id, zend_phpdbg_globals *); + *ptr = *settings; #else phpdbg_globals = *settings; #endif diff --git a/sapi/phpdbg/phpdbg_utils.h b/sapi/phpdbg/phpdbg_utils.h index 90648c4..84b1f5c 100644 --- a/sapi/phpdbg/phpdbg_utils.h +++ b/sapi/phpdbg/phpdbg_utils.h @@ -111,7 +111,7 @@ static zend_always_inline zend_execute_data *phpdbg_user_execute_data(zend_execu #define PHPDBG_OUTPUT_BACKUP_DEFINES() \ zend_output_globals *output_globals_ptr; \ zend_output_globals original_output_globals; \ - output_globals_ptr = (zend_output_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)]; + output_globals_ptr = TSRMG_BULK(output_globals_id, zend_output_globals *); #else #define PHPDBG_OUTPUT_BACKUP_DEFINES() \ zend_output_globals *output_globals_ptr; \