pajoye Fri, 17 Sep 2010 08:41:05 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303453
Log: - drop TSRMLS_FETCH in sapi_register_* (won't bring much at runtime :) ) and cleanup/group the upgrade guide, no need of twenty titles for the same change Changed paths: U php/php-src/trunk/main/SAPI.c U php/php-src/trunk/main/SAPI.h U php/php-src/trunk/main/php_content_types.c Modified: php/php-src/trunk/main/SAPI.c =================================================================== --- php/php-src/trunk/main/SAPI.c 2010-09-17 08:17:43 UTC (rev 303452) +++ php/php-src/trunk/main/SAPI.c 2010-09-17 08:41:05 UTC (rev 303453) @@ -850,9 +850,8 @@ } -SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D)) +SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC) { - TSRMLS_FETCH(); if (SG(sapi_started) && EG(in_execution)) { return FAILURE; } @@ -861,9 +860,8 @@ } -SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC)) +SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC) { - TSRMLS_FETCH(); if (SG(sapi_started) && EG(in_execution)) { return FAILURE; } @@ -871,9 +869,8 @@ return SUCCESS; } -SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D)) +SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC) { - TSRMLS_FETCH(); if (SG(sapi_started) && EG(in_execution)) { return FAILURE; } Modified: php/php-src/trunk/main/SAPI.h =================================================================== --- php/php-src/trunk/main/SAPI.h 2010-09-17 08:17:43 UTC (rev 303452) +++ php/php-src/trunk/main/SAPI.h 2010-09-17 08:41:05 UTC (rev 303453) @@ -190,9 +190,9 @@ SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry TSRMLS_DC); SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry TSRMLS_DC); SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry TSRMLS_DC); -SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D)); -SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC)); -SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D)); +SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC); +SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC); +SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC); SAPI_API int sapi_flush(TSRMLS_D); SAPI_API struct stat *sapi_get_stat(TSRMLS_D); Modified: php/php-src/trunk/main/php_content_types.c =================================================================== --- php/php-src/trunk/main/php_content_types.c 2010-09-17 08:17:43 UTC (rev 303452) +++ php/php-src/trunk/main/php_content_types.c 2010-09-17 08:41:05 UTC (rev 303453) @@ -73,9 +73,9 @@ */ int php_startup_sapi_content_types(TSRMLS_D) { - sapi_register_default_post_reader(php_default_post_reader); - sapi_register_treat_data(php_default_treat_data); - sapi_register_input_filter(php_default_input_filter, NULL); + sapi_register_default_post_reader(php_default_post_reader TSRMLS_CC); + sapi_register_treat_data(php_default_treat_data TSRMLS_CC); + sapi_register_input_filter(php_default_input_filter, NULL TSRMLS_CC); return SUCCESS; } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php