From 05383a1072d5dacf6d26c84d2bf3241f03c7b0cf Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Fri, 17 Sep 2010 08:41:05 +0000 Subject: [PATCH] - 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 --- main/SAPI.c | 9 +++------ main/SAPI.h | 6 +++--- main/php_content_types.c | 6 +++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/main/SAPI.c b/main/SAPI.c index 2287a0e4e7..31f2916c71 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -850,9 +850,8 @@ 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_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_default_post_reader(void (*default_post_reader)(TSRML } -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 @@ SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zva 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; } diff --git a/main/SAPI.h b/main/SAPI.h index 3d14ae53f8..8c7275a404 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -190,9 +190,9 @@ SAPI_API void sapi_handle_post(void *arg TSRMLS_DC); 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); diff --git a/main/php_content_types.c b/main/php_content_types.c index 27cbb0b125..04824d48ad 100644 --- a/main/php_content_types.c +++ b/main/php_content_types.c @@ -73,9 +73,9 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader) */ 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; } /* }}} */ -- 2.49.0